mac80211: update to latest version from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 545-ath9k_aggr_padding_fix.patch

diff --git a/package/mac80211/patches/545-ath9k_aggr_padding_fix.patch b/package/mac80211/patches/545-ath9k_aggr_padding_fix.patch
deleted file mode 100644 (file)
index 77938c4..0000000
--- a/package/mac80211/patches/545-ath9k_aggr_padding_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -709,7 +709,9 @@ static int ath_compute_num_delims(struct
-        * Add delimiter when using RTS/CTS with aggregation
-        * and non enterprise AR9003 card
-        */
--      if (first_subfrm)
-+      if (first_subfrm && (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
-+          !AR_SREV_9580_10_OR_LATER(sc->sc_ah) &&
-+          (sc->sc_ah->ent_mode & AR_ENT_OTP_MIN_PKT_SIZE_DISABLE))
-               ndelim = max(ndelim, FIRST_DESC_NDELIMS);
- 
-       /*
---- a/drivers/net/wireless/ath/ath9k/reg.h
-+++ b/drivers/net/wireless/ath/ath9k/reg.h
-@@ -1132,7 +1132,7 @@ enum {
- #define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)
- #define AR_ENT_OTP              0x40d8
- #define AR_ENT_OTP_CHAIN2_DISABLE               0x00020000
--#define AR_ENT_OTP_MPSD               0x00800000
-+#define AR_ENT_OTP_MIN_PKT_SIZE_DISABLE               0x00800000
- 
- #define AR_CH0_BB_DPLL1                0x16180
- #define AR_CH0_BB_DPLL1_REFDIV         0xF8000000