ath9k: merge a few more pending fixes, including a fix for the bogus WARN_ON in pci...

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 513-ath9k_channelbw_debugfs.patch

diff --git a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
index 4aeddda47394dfe735a6a5bf4bdbf77941cdb137..6ae1323d2b4ceff60b0dbb739ae72597caae401e 100644 (file)
--- a/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
+++ b/package/mac80211/patches/513-ath9k_channelbw_debugfs.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -588,6 +588,7 @@ struct ath_softc {
+@@ -587,6 +587,7 @@ struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
  
@@ -10,7 +10,7 @@
        struct survey_info *cur_survey;
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1323,6 +1323,9 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1378,6 +1378,9 @@ int ath9k_init_debug(struct ath_hw *ah)
        debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_eeprom);