Commit e63e3fa7 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

adm8211: fix sparse warnings

Both of these seem to be actual errors, the first is just wrong
and the second is my mistake introduced by the cfg80211 API
update.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ffc7689d
...@@ -1109,7 +1109,7 @@ static void adm8211_hw_init(struct ieee80211_hw *dev) ...@@ -1109,7 +1109,7 @@ static void adm8211_hw_init(struct ieee80211_hw *dev)
u32 reg; u32 reg;
u8 cline; u8 cline;
reg = le32_to_cpu(ADM8211_CSR_READ(PAR)); reg = ADM8211_CSR_READ(PAR);
reg |= ADM8211_PAR_MRLE | ADM8211_PAR_MRME; reg |= ADM8211_PAR_MRLE | ADM8211_PAR_MRME;
reg &= ~(ADM8211_PAR_BAR | ADM8211_PAR_CAL); reg &= ~(ADM8211_PAR_BAR | ADM8211_PAR_CAL);
...@@ -1702,13 +1702,9 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb, ...@@ -1702,13 +1702,9 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
int plcp, dur, len, plcp_signal, short_preamble; int plcp, dur, len, plcp_signal, short_preamble;
struct ieee80211_hdr *hdr; struct ieee80211_hdr *hdr;
if (control->tx_rate < 0) { short_preamble = !!(control->tx_rate->flags &
short_preamble = 1; IEEE80211_TXCTL_SHORT_PREAMBLE);
plcp_signal = -control->tx_rate->bitrate; plcp_signal = control->tx_rate->bitrate;
} else {
short_preamble = 0;
plcp_signal = control->tx_rate->bitrate;
}
hdr = (struct ieee80211_hdr *)skb->data; hdr = (struct ieee80211_hdr *)skb->data;
fc = le16_to_cpu(hdr->frame_control) & ~IEEE80211_FCTL_PROTECTED; fc = le16_to_cpu(hdr->frame_control) & ~IEEE80211_FCTL_PROTECTED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment