kmod-ipsec: fix a compile error with some configurations. since CONFIG_XFRM_IPCOMP...
[openwrt/staging/dedeckeh.git] / package / mac80211 / patches / 531-ath9k_nf_cleanup.patch
1 --- a/drivers/net/wireless/ath/ath9k/calib.c
2 +++ b/drivers/net/wireless/ath/ath9k/calib.c
3 @@ -172,26 +172,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah,
4 struct ath9k_nfcal_hist *h;
5 unsigned i, j;
6 int32_t val;
7 - u8 chainmask;
8 + u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
9 struct ath_common *common = ath9k_hw_common(ah);
10
11 - if (AR_SREV_9300_20_OR_LATER(ah))
12 - chainmask = 0x3F;
13 - else if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
14 - chainmask = 0x9;
15 - else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) {
16 - if ((ah->rxchainmask & 0x2) || (ah->rxchainmask & 0x4))
17 - chainmask = 0x1B;
18 - else
19 - chainmask = 0x09;
20 - } else {
21 - if (ah->rxchainmask & 0x4)
22 - chainmask = 0x3F;
23 - else if (ah->rxchainmask & 0x2)
24 - chainmask = 0x1B;
25 - else
26 - chainmask = 0x09;
27 - }
28 h = ah->nfCalHist;
29
30 for (i = 0; i < NUM_NF_READINGS; i++) {