aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-11 14:54:41 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-11 14:55:22 +0200
commit4f106d6c07a1802e2d363002f248dc8d95a147a0 (patch)
treedcba95ee76f839bd2b9507c614a7f3530a3ad816 /package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
parent4ebb1950befc7a53cea0c499f3e94ef60cef4c4d (diff)
downloadupstream-4f106d6c07a1802e2d363002f248dc8d95a147a0.tar.gz
upstream-4f106d6c07a1802e2d363002f248dc8d95a147a0.tar.bz2
upstream-4f106d6c07a1802e2d363002f248dc8d95a147a0.zip
Revert "ath9k: switch to using mac80211 intermediate software queues"
This reverts commit 31e5ed4152c4aa826641b2db6b4245a03dd553b5. I've noticed some weird powersave related issues with this commit. Revert until they've been fixed. Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/530-ath9k_extra_leds.patch')
-rw-r--r--package/kernel/mac80211/patches/530-ath9k_extra_leds.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
index 0b25749608..a8a8a4cc7b 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
+@@ -816,6 +816,9 @@ static inline int ath9k_dump_btcoex(stru
#ifdef CPTCFG_MAC80211_LEDS
void ath_init_leds(struct ath_softc *sc);
void ath_deinit_leds(struct ath_softc *sc);
@@ -10,7 +10,7 @@
#else
static inline void ath_init_leds(struct ath_softc *sc)
{
-@@ -950,6 +953,13 @@ void ath_ant_comb_scan(struct ath_softc
+@@ -952,6 +955,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;
-@@ -1002,9 +1012,8 @@ struct ath_softc {
+@@ -1004,9 +1014,8 @@ struct ath_softc {
spinlock_t chan_lock;
#ifdef CPTCFG_MAC80211_LEDS
@@ -201,7 +201,7 @@
#endif
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1407,6 +1407,61 @@ static const struct file_operations fops
+@@ -1411,6 +1411,61 @@ static const struct file_operations fops
.llseek = default_llseek,
};
@@ -263,7 +263,7 @@
int ath9k_init_debug(struct ath_hw *ah)
{
-@@ -1431,6 +1486,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1435,6 +1490,10 @@ int ath9k_init_debug(struct ath_hw *ah)
&fops_eeprom);
debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
sc, &fops_chanbw);