From 8f7f0f90900053b35ab3d24dc4da5af4eb1d6fef Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 9 Jan 2013 12:56:25 +0000 Subject: mac80211, ath9k: merge some pending fixes from linux-wireless@ git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35066 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/mac80211/patches/553-ath9k_debugfs_diag.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/mac80211/patches/553-ath9k_debugfs_diag.patch') diff --git a/package/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/mac80211/patches/553-ath9k_debugfs_diag.patch index 986b6be1a..dd096f4a6 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 */ -- cgit v1.2.3