diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:56:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-09 12:56:25 +0000 |
| commit | ddbb25c6a79a0836a79eab96d9c0a293acee4089 (patch) | |
| tree | 510a754bcce3454e40903bf2f306a65939b7f546 /package/mac80211/patches/553-ath9k_debugfs_diag.patch | |
| parent | 5c9fd3b2d26012f8b77d1f5c86bf0b9223460cf4 (diff) | |
| download | upstream-ddbb25c6a79a0836a79eab96d9c0a293acee4089.tar.gz upstream-ddbb25c6a79a0836a79eab96d9c0a293acee4089.tar.bz2 upstream-ddbb25c6a79a0836a79eab96d9c0a293acee4089.zip | |
mac80211, ath9k: merge some pending fixes from linux-wireless@
SVN-Revision: 35066
Diffstat (limited to 'package/mac80211/patches/553-ath9k_debugfs_diag.patch')
| -rw-r--r-- | package/mac80211/patches/553-ath9k_debugfs_diag.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/mac80211/patches/553-ath9k_debugfs_diag.patch index 986b6be1af..dd096f4a68 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 -@@ -1864,6 +1864,50 @@ static const struct file_operations fops +@@ -1863,6 +1863,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); -@@ -1889,6 +1933,8 @@ int ath9k_init_debug(struct ath_hw *ah) +@@ -1888,6 +1932,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 @@ -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 -@@ -470,6 +470,11 @@ irqreturn_t ath_isr(int irq, void *dev) +@@ -464,6 +464,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 */ |