From 672034cb983af45eb0715fd5a28c6591eaa92598 Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 16 Nov 2009 17:31:29 +0000 Subject: package/mac80211: use platform_data on PCI devices in ath9k git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...E_EEPROM-only-if-no-platform-data-present.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch (limited to '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 new file mode 100644 index 000000000..8beb224c9 --- /dev/null +++ b/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch @@ -0,0 +1,43 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -433,11 +433,8 @@ static void ath9k_hw_init_defaults(struc + ah->hw_version.magic = AR5416_MAGIC; + ah->hw_version.subvendorid = 0; + +- ah->ah_flags = 0; + if (ah->hw_version.devid == AR5416_AR9100_DEVID) + ah->hw_version.macVersion = AR_SREV_VERSION_9100; +- 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; +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -15,6 +15,7 @@ + */ + + #include ++#include + #include "ath9k.h" + #include "btcoex.h" + +@@ -1633,6 +1634,7 @@ static int ath_init_softc(u16 devid, str + { + struct ath_hw *ah = NULL; + struct ath_common *common; ++ struct ath9k_platform_data *pdata; + int r = 0, i; + int csz = 0; + int qnum; +@@ -1656,6 +1658,10 @@ static int ath_init_softc(u16 devid, str + + ah->hw_version.devid = devid; + ah->hw_version.subsysid = subsysid; ++ pdata = (struct ath9k_platform_data *) sc->dev->platform_data; ++ if (!pdata) ++ ah->ah_flags |= AH_USE_EEPROM; ++ + sc->sc_ah = ah; + + common = ath9k_hw_common(ah); -- cgit v1.2.3