Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/wireless/adm8211.c

+4 −8
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ static void adm8211_hw_init(struct ieee80211_hw *dev) 
	u32 reg;

	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_BAR | ADM8211_PAR_CAL);
@@ -1702,13 +1702,9 @@ static int adm8211_tx(struct ieee80211_hw *dev, struct sk_buff *skb, 
	int plcp, dur, len, plcp_signal, short_preamble;

	struct ieee80211_hdr *hdr;



	if (control->tx_rate < 0) {

		short_preamble = 1;

		plcp_signal = -control->tx_rate->bitrate;

	} else {

		short_preamble = 0;

	short_preamble = !!(control->tx_rate->flags &

					IEEE80211_TXCTL_SHORT_PREAMBLE);

	plcp_signal = control->tx_rate->bitrate;

	}



	hdr = (struct ieee80211_hdr *)skb->data;

	fc = le16_to_cpu(hdr->frame_control) & ~IEEE80211_FCTL_PROTECTED;