diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-01-15 01:16:40 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-01-15 01:16:40 +0000 |
| commit | 99ae1183d3146aa9c69574028776026f52b29a98 (patch) | |
| tree | b87c43a312e236e4de933bf52b058894fd3c0927 /package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch | |
| parent | 5f4a13fbdb5407738544df1bb29d4220a521bfc4 (diff) | |
| download | master-187ad058-99ae1183d3146aa9c69574028776026f52b29a98.tar.gz master-187ad058-99ae1183d3146aa9c69574028776026f52b29a98.tar.bz2 master-187ad058-99ae1183d3146aa9c69574028776026f52b29a98.zip | |
mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19139 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch')
| -rw-r--r-- | package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch | 16 |
1 files changed, 9 insertions, 7 deletions
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 index 6be7888144..c09935ee75 100644 --- 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 @@ -22,22 +22,24 @@ #include "ath9k.h" #include "btcoex.h" -@@ -1597,6 +1598,7 @@ static int ath_init_softc(u16 devid, str +--- a/drivers/net/wireless/ath/ath9k/init.c ++++ b/drivers/net/wireless/ath/ath9k/init.c +@@ -531,6 +531,7 @@ static int ath9k_init_softc(u16 devid, s { struct ath_hw *ah = NULL; struct ath_common *common; + struct ath9k_platform_data *pdata; - int r = 0, i; + int ret = 0, i; int csz = 0; - int qnum; -@@ -1619,6 +1621,10 @@ static int ath_init_softc(u16 devid, str - ah->hw_version.devid = devid; +@@ -542,6 +543,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; + - sc->sc_ah = ah; - common = ath9k_hw_common(ah); + common->ops = &ath9k_common_ops; + common->bus_ops = bus_ops; |