diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-09-08 09:38:32 +0000 |
| commit | 249c39658335ea2a1e5cd2edab27970a4db19d66 (patch) | |
| tree | d377ba708ed048f955b5a97d36808076bd0c2cf2 /package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch | |
| parent | f39f07cd09c6b4cdfba71d006ad82ba71bd31328 (diff) | |
| download | upstream-249c39658335ea2a1e5cd2edab27970a4db19d66.tar.gz upstream-249c39658335ea2a1e5cd2edab27970a4db19d66.tar.bz2 upstream-249c39658335ea2a1e5cd2edab27970a4db19d66.zip | |
mac80211: merge a big batch of upstream changes/improvements
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37918
Diffstat (limited to 'package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch b/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch index c5b90af68c..e59627c3d8 100644 --- a/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch +++ b/package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch @@ -12,7 +12,7 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2449,17 +2449,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -2456,17 +2456,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw } eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE); @@ -48,7 +48,7 @@ AR_SREV_9285(ah) || --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -948,6 +948,8 @@ struct ath_hw { +@@ -955,6 +955,8 @@ struct ath_hw { bool is_clk_25mhz; int (*get_mac_revision)(void); int (*external_reset)(void); @@ -59,7 +59,7 @@ }; --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -613,6 +613,8 @@ static int ath9k_init_softc(u16 devid, s +@@ -631,6 +631,8 @@ static int ath9k_init_softc(u16 devid, s ah->is_clk_25mhz = pdata->is_clk_25mhz; ah->get_mac_revision = pdata->get_mac_revision; ah->external_reset = pdata->external_reset; |