diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-02-23 01:12:36 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-02-23 01:12:36 +0000 |
commit | 9fe45e941a964ef216ad90d7e6087f84eed9f298 (patch) | |
tree | 5396819280091bb168bad171afc4309901643fae /package/mac80211/patches/553-ath9k_debugfs_diag.patch | |
parent | 39e831c44568e58e22f939cabbd0a4f22542e42a (diff) | |
download | upstream-9fe45e941a964ef216ad90d7e6087f84eed9f298.tar.gz upstream-9fe45e941a964ef216ad90d7e6087f84eed9f298.tar.bz2 upstream-9fe45e941a964ef216ad90d7e6087f84eed9f298.zip |
mac80211: update to wireless-testing 2013-02-22
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35753 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/553-ath9k_debugfs_diag.patch')
-rw-r--r-- | package/mac80211/patches/553-ath9k_debugfs_diag.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/mac80211/patches/553-ath9k_debugfs_diag.patch index 8a1fcf6624..fcc7dab591 100644 --- a/package/mac80211/patches/553-ath9k_debugfs_diag.patch +++ b/package/mac80211/patches/553-ath9k_debugfs_diag.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -1863,6 +1863,50 @@ static const struct file_operations fops +@@ -2149,6 +2149,50 @@ static const struct file_operations fops }; @@ -51,7 +51,7 @@ int ath9k_init_debug(struct ath_hw *ah) { struct ath_common *common = ath9k_hw_common(ah); -@@ -1888,6 +1932,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -2174,6 +2218,8 @@ int ath9k_init_debug(struct ath_hw *ah) debugfs_create_file("gpio_led", S_IWUSR, sc->debug.debugfs_phy, sc, &fops_gpio_led); #endif @@ -62,7 +62,7 @@ debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc, --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -499,6 +499,12 @@ enum { +@@ -500,6 +500,12 @@ enum { ATH9K_RESET_COLD, }; @@ -75,7 +75,7 @@ struct ath9k_hw_version { u32 magic; u16 devid; -@@ -738,6 +744,8 @@ struct ath_hw { +@@ -778,6 +784,8 @@ struct ath_hw { u32 rfkill_polarity; u32 ah_flags; @@ -84,7 +84,7 @@ bool reset_power_on; bool htc_reset_init; -@@ -988,6 +996,7 @@ void ath9k_hw_set_sta_beacon_timers(stru +@@ -1041,6 +1049,7 @@ void ath9k_hw_set_sta_beacon_timers(stru bool ath9k_hw_check_alive(struct ath_hw *ah); bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode); @@ -125,7 +125,7 @@ REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON); --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -462,6 +462,11 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -459,6 +459,11 @@ irqreturn_t ath_isr(int irq, void *dev) ath9k_hw_getisr(ah, &status); /* NB: clears ISR too */ status &= ah->imask; /* discard unasked-for bits */ |