ath9k: merge another round of upstream (or -pending) fixes and cleanups

[openwrt.git] / package / kernel / mac80211 / patches / 500-ath9k_eeprom_debugfs.patch

diff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index 321e75e..4c81ef1 100644 (file)
--- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -1,7 +1,7 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1782,6 +1782,53 @@ void ath9k_deinit_debug(struct ath_softc
-       }
+@@ -1528,6 +1528,53 @@ void ath9k_deinit_debug(struct ath_softc
+       ath9k_spectral_deinit_debug(sc);
  }
  
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
@@ -54,9 +54,9 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -1800,6 +1847,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-       ath9k_dfs_init_debug(sc);
+@@ -1547,6 +1594,8 @@ int ath9k_init_debug(struct ath_hw *ah)
        ath9k_tx99_init_debug(sc);
+       ath9k_spectral_init_debug(sc);
  
 +      debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
 +                          &fops_eeprom);