diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:41:34 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:41:34 +0000 |
| commit | 71c277203f7c68aa65a5a23f03dc068edcdc5ad2 (patch) | |
| tree | ff39f20c60f1146dd0756f7153115ce807667ead /package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch | |
| parent | e38ea5ee297970b1bf1ac228466d99e01f45bd05 (diff) | |
| download | upstream-71c277203f7c68aa65a5a23f03dc068edcdc5ad2.tar.gz upstream-71c277203f7c68aa65a5a23f03dc068edcdc5ad2.tar.bz2 upstream-71c277203f7c68aa65a5a23f03dc068edcdc5ad2.zip | |
mac80211: update to wireless-testing 2010-06-15
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21943 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 | 10 |
1 files changed, 5 insertions, 5 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 72d3701dc5..0a0c2efb9f 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 @@ -10,7 +10,7 @@ --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -556,6 +556,7 @@ static int ath9k_init_softc(u16 devid, s +@@ -534,6 +534,7 @@ static int ath9k_init_softc(u16 devid, s { struct ath_hw *ah = NULL; struct ath_common *common; @@ -18,7 +18,7 @@ int ret = 0, i; int csz = 0; -@@ -567,6 +568,10 @@ static int ath9k_init_softc(u16 devid, s +@@ -545,6 +546,10 @@ static int ath9k_init_softc(u16 devid, s ah->hw_version.subsysid = subsysid; sc->sc_ah = ah; @@ -31,7 +31,7 @@ common->bus_ops = bus_ops; --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -423,10 +423,6 @@ static void ath9k_hw_init_defaults(struc +@@ -421,10 +421,6 @@ static void ath9k_hw_init_defaults(struc ah->hw_version.magic = AR5416_MAGIC; ah->hw_version.subvendorid = 0; @@ -40,5 +40,5 @@ - ah->ah_flags = AH_USE_EEPROM; - ah->atim_window = 0; - ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE; - ah->beacon_interval = 100; + ah->sta_id1_defaults = + AR_STA_ID1_CRPT_MIC_ENABLE | |