ath9k: add some cleanup patches
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 591-ath9k_cleanup_rx_status_rate.patch
1 --- a/drivers/net/wireless/ath/ath9k/mac.c
2 +++ b/drivers/net/wireless/ath/ath9k/mac.c
3 @@ -596,7 +596,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
4 else
5 rs->rs_keyix = ATH9K_RXKEYIX_INVALID;
6
7 - rs->rs_rate = RXSTATUS_RATE(ah, (&ads));
8 + rs->rs_rate = MS(ads.ds_rxstatus0, AR_RxRate);
9 rs->rs_more = (ads.ds_rxstatus1 & AR_RxMore) ? 1 : 0;
10
11 rs->rs_isaggr = (ads.ds_rxstatus8 & AR_RxAggr) ? 1 : 0;
12 --- a/drivers/net/wireless/ath/ath9k/mac.h
13 +++ b/drivers/net/wireless/ath/ath9k/mac.h
14 @@ -17,10 +17,6 @@
15 #ifndef MAC_H
16 #define MAC_H
17
18 -#define RXSTATUS_RATE(ah, ads) (AR_SREV_5416_20_OR_LATER(ah) ? \
19 - MS(ads->ds_rxstatus0, AR_RxRate) : \
20 - (ads->ds_rxstatus3 >> 2) & 0xFF)
21 -
22 #define set11nTries(_series, _index) \
23 (SM((_series)[_index].Tries, AR_XmitDataTries##_index))
24