aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-07-22 12:45:03 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-07-22 12:45:03 +0000
commit13d546db7b9553626cd7c28a23d2e7aa7c80edc2 (patch)
tree9870131310293a7da3f6e12e266034bd28ce6090 /package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
parent25a97d400c00ab4ab144eb8df10e16b62e52c4f6 (diff)
downloadmaster-187ad058-13d546db7b9553626cd7c28a23d2e7aa7c80edc2.tar.gz
master-187ad058-13d546db7b9553626cd7c28a23d2e7aa7c80edc2.tar.bz2
master-187ad058-13d546db7b9553626cd7c28a23d2e7aa7c80edc2.zip
mac80211: update to wireless-testing 2015-07-21
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46436 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/mac80211/patches/530-ath9k_extra_leds.patch')
-rw-r--r--package/kernel/mac80211/patches/530-ath9k_extra_leds.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 2f0a6366f3..8aab45aa30 100644
--- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -814,6 +814,9 @@ static inline int ath9k_dump_btcoex(stru
+@@ -806,6 +806,9 @@ static inline int ath9k_dump_btcoex(stru
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
void ath_fill_led_pin(struct ath_softc *sc);
@@ -10,7 +10,7 @@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -953,6 +956,13 @@ void ath_ant_comb_scan(struct ath_softc
+@@ -945,6 +948,13 @@ void ath_ant_comb_scan(struct ath_softc
#define ATH9K_NUM_CHANCTX 2 /* supports 2 operating channels */
@@ -24,7 +24,7 @@
struct ath_softc {
struct ieee80211_hw *hw;
struct device *dev;
-@@ -1004,9 +1014,8 @@ struct ath_softc {
+@@ -996,9 +1006,8 @@ struct ath_softc {
spinlock_t chan_lock;
#ifdef CPTCFG_MAC80211_LEDS
@@ -165,7 +165,7 @@
void ath_fill_led_pin(struct ath_softc *sc)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -942,7 +942,7 @@ int ath9k_init_device(u16 devid, struct
+@@ -943,7 +943,7 @@ int ath9k_init_device(u16 devid, struct
#ifdef CPTCFG_MAC80211_LEDS
/* must be initialized before ieee80211_register_hw */