25 lines
791 B
Diff
25 lines
791 B
Diff
|
--- a/drivers/net/wireless/ath/ath9k/mac.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/mac.c
|
||
|
|
@@ -596,7 +596,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
|
||
|
|
else
|
||
|
|
rs->rs_keyix = ATH9K_RXKEYIX_INVALID;
|
||
|
|
|
||
|
|
- rs->rs_rate = RXSTATUS_RATE(ah, (&ads));
|
||
|
|
+ rs->rs_rate = MS(ads.ds_rxstatus0, AR_RxRate);
|
||
|
|
rs->rs_more = (ads.ds_rxstatus1 & AR_RxMore) ? 1 : 0;
|
||
|
|
|
||
|
|
rs->rs_isaggr = (ads.ds_rxstatus8 & AR_RxAggr) ? 1 : 0;
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/mac.h
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/mac.h
|
||
|
|
@@ -17,10 +17,6 @@
|
||
|
|
#ifndef MAC_H
|
||
|
|
#define MAC_H
|
||
|
|
|
||
|
|
-#define RXSTATUS_RATE(ah, ads) (AR_SREV_5416_20_OR_LATER(ah) ? \
|
||
|
|
- MS(ads->ds_rxstatus0, AR_RxRate) : \
|
||
|
|
- (ads->ds_rxstatus3 >> 2) & 0xFF)
|
||
|
|
-
|
||
|
|
#define set11nTries(_series, _index) \
|
||
|
|
(SM((_series)[_index].Tries, AR_XmitDataTries##_index))
|
||
|
|
|