diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index dab0271f1c1a..6636f3c6dcf9 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -95,9 +95,9 @@ struct ath_config { | |||
95 | * @BUF_XRETRY: To denote excessive retries of the buffer | 95 | * @BUF_XRETRY: To denote excessive retries of the buffer |
96 | */ | 96 | */ |
97 | enum buffer_type { | 97 | enum buffer_type { |
98 | BUF_AMPDU = BIT(2), | 98 | BUF_AMPDU = BIT(0), |
99 | BUF_AGGR = BIT(3), | 99 | BUF_AGGR = BIT(1), |
100 | BUF_XRETRY = BIT(5), | 100 | BUF_XRETRY = BIT(2), |
101 | }; | 101 | }; |
102 | 102 | ||
103 | #define bf_isampdu(bf) (bf->bf_state.bf_type & BUF_AMPDU) | 103 | #define bf_isampdu(bf) (bf->bf_state.bf_type & BUF_AMPDU) |
@@ -137,7 +137,6 @@ void ath_descdma_cleanup(struct ath_softc *sc, struct ath_descdma *dd, | |||
137 | (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI : \ | 137 | (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI : \ |
138 | WME_AC_VO) | 138 | WME_AC_VO) |
139 | 139 | ||
140 | #define ADDBA_EXCHANGE_ATTEMPTS 10 | ||
141 | #define ATH_AGGR_DELIM_SZ 4 | 140 | #define ATH_AGGR_DELIM_SZ 4 |
142 | #define ATH_AGGR_MINPLEN 256 /* in bytes, minimum packet length */ | 141 | #define ATH_AGGR_MINPLEN 256 /* in bytes, minimum packet length */ |
143 | /* number of delimiters for encryption padding */ | 142 | /* number of delimiters for encryption padding */ |
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index 5f05a3abbf6a..6fcf1d708843 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -19,7 +19,6 @@ | |||
19 | 19 | ||
20 | #define BITS_PER_BYTE 8 | 20 | #define BITS_PER_BYTE 8 |
21 | #define OFDM_PLCP_BITS 22 | 21 | #define OFDM_PLCP_BITS 22 |
22 | #define HT_RC_2_MCS(_rc) ((_rc) & 0x1f) | ||
23 | #define HT_RC_2_STREAMS(_rc) ((((_rc) & 0x78) >> 3) + 1) | 22 | #define HT_RC_2_STREAMS(_rc) ((((_rc) & 0x78) >> 3) + 1) |
24 | #define L_STF 8 | 23 | #define L_STF 8 |
25 | #define L_LTF 8 | 24 | #define L_LTF 8 |
@@ -32,7 +31,6 @@ | |||
32 | #define NUM_SYMBOLS_PER_USEC(_usec) (_usec >> 2) | 31 | #define NUM_SYMBOLS_PER_USEC(_usec) (_usec >> 2) |
33 | #define NUM_SYMBOLS_PER_USEC_HALFGI(_usec) (((_usec*5)-4)/18) | 32 | #define NUM_SYMBOLS_PER_USEC_HALFGI(_usec) (((_usec*5)-4)/18) |
34 | 33 | ||
35 | #define OFDM_SIFS_TIME 16 | ||
36 | 34 | ||
37 | static u16 bits_per_symbol[][2] = { | 35 | static u16 bits_per_symbol[][2] = { |
38 | /* 20MHz 40MHz */ | 36 | /* 20MHz 40MHz */ |