mac80211: backport latest version from trunk (as of r28137)
[openwrt-10.03/.git] / package / mac80211 / patches / 545-ath9k_aggr_padding_fix.patch
1 --- a/drivers/net/wireless/ath/ath9k/xmit.c
2 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3 @@ -709,7 +709,9 @@ static int ath_compute_num_delims(struct
4          * Add delimiter when using RTS/CTS with aggregation
5          * and non enterprise AR9003 card
6          */
7 -       if (first_subfrm)
8 +       if (first_subfrm && (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
9 +           !AR_SREV_9580_10_OR_LATER(sc->sc_ah) &&
10 +           (sc->sc_ah->ent_mode & AR_ENT_OTP_MIN_PKT_SIZE_DISABLE))
11                 ndelim = max(ndelim, FIRST_DESC_NDELIMS);
12  
13         /*
14 --- a/drivers/net/wireless/ath/ath9k/reg.h
15 +++ b/drivers/net/wireless/ath/ath9k/reg.h
16 @@ -1132,7 +1132,7 @@ enum {
17  #define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)
18  #define AR_ENT_OTP               0x40d8
19  #define AR_ENT_OTP_CHAIN2_DISABLE               0x00020000
20 -#define AR_ENT_OTP_MPSD                0x00800000
21 +#define AR_ENT_OTP_MIN_PKT_SIZE_DISABLE                0x00800000
22  
23  #define AR_CH0_BB_DPLL1                 0x16180
24  #define AR_CH0_BB_DPLL1_REFDIV  0xF8000000