mac80211: update to wireless-testing 2010-11-16

[openwrt/openwrt.git] / package / mac80211 / patches / 406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

diff --git a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
deleted file mode 100644 (file)
index 87ea00a..0000000
--- a/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -16,6 +16,7 @@
- 
- #include <linux/nl80211.h>
- #include <linux/pm_qos_params.h>
-+#include <linux/ath9k_platform.h>
- #include "ath9k.h"
- #include "btcoex.h"
- 
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -522,6 +522,7 @@ static int ath9k_init_softc(u16 devid, s
- {
-       struct ath_hw *ah = NULL;
-       struct ath_common *common;
-+      struct ath9k_platform_data *pdata;
-       int ret = 0, i;
-       int csz = 0;
- 
-@@ -533,6 +534,10 @@ static int ath9k_init_softc(u16 devid, s
-       ah->hw_version.subsysid = subsysid;
-       sc->sc_ah = ah;
- 
-+      pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
-+      if (!pdata)
-+              ah->ah_flags |= AH_USE_EEPROM;
-+
-       common = ath9k_hw_common(ah);
-       common->ops = &ath9k_common_ops;
-       common->bus_ops = bus_ops;
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -420,10 +420,6 @@ static void ath9k_hw_init_defaults(struc
-       ah->hw_version.magic = AR5416_MAGIC;
-       ah->hw_version.subvendorid = 0;
- 
--      ah->ah_flags = 0;
--      if (!AR_SREV_9100(ah))
--              ah->ah_flags = AH_USE_EEPROM;
--
-       ah->atim_window = 0;
-       ah->sta_id1_defaults =
-               AR_STA_ID1_CRPT_MIC_ENABLE |