diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-12-19 17:18:07 +0000 |
| commit | bac83378e74eeae366b80d209dcd7b442f1d4012 (patch) | |
| tree | 5b5c4aa12aef79d237bb7ce4e3f358c9f5546e25 /package/kernel/mac80211/patches/543-ath9k-allow-to-disable-bands-via-platform-data.patch | |
| parent | 5db5354c708f62a5c4814342334951dbd4e089e7 (diff) | |
| download | upstream-bac83378e74eeae366b80d209dcd7b442f1d4012.tar.gz upstream-bac83378e74eeae366b80d209dcd7b442f1d4012.tar.bz2 upstream-bac83378e74eeae366b80d209dcd7b442f1d4012.zip | |
ath9k: merge another round of upstream (or -pending) fixes and cleanups
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39138
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 0e83822f05..a775ad9b4b 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 @@ -11,7 +11,7 @@ int (*external_reset)(void); --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -2441,17 +2441,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw +@@ -2409,17 +2409,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw } eeval = ah->eep_ops->get_eeprom(ah, EEP_OP_MODE); @@ -47,7 +47,7 @@ AR_SREV_9285(ah) || --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -914,6 +914,8 @@ struct ath_hw { +@@ -915,6 +915,8 @@ struct ath_hw { bool is_clk_25mhz; int (*get_mac_revision)(void); int (*external_reset)(void); @@ -58,7 +58,7 @@ }; --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -721,6 +721,8 @@ static int ath9k_init_softc(u16 devid, s +@@ -719,6 +719,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; |