mac80211: merge a client mode channel switch handling fix

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

diff --git a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
index 9b75fb5df95cf390caa3a6d3d9b8f93e4b480274..25c0c2004fe23a1e1a07b3eb91a86475664cfcbf 100644 (file)
--- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -1077,6 +1077,53 @@ static const struct file_operations fops
-       .llseek = default_llseek,/* read accesses f_pos */
- };
+@@ -2012,6 +2012,53 @@ void ath9k_get_et_stats(struct ieee80211
+       WARN_ON(i != ATH9K_SSTATS_LEN);
+ }
  
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
 +                           size_t count, loff_t *ppos)
@@ -47,20 +47,19 @@
 +
 +static const struct file_operations fops_eeprom = {
 +      .read = read_file_eeprom,
-+      .open = ath9k_debugfs_open,
++      .open = simple_open,
 +      .owner = THIS_MODULE
 +};
 +
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -1125,6 +1172,9 @@ int ath9k_init_debug(struct ath_hw *ah)
-       debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR,
-                          sc->debug.debugfs_phy, &sc->sc_ah->gpio_val);
+@@ -2029,6 +2076,8 @@ int ath9k_init_debug(struct ath_hw *ah)
+ 
+       ath9k_dfs_init_debug(sc);
  
 +      debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
 +                          &fops_eeprom);
-+
-       sc->debug.regidx = 0;
-       return 0;
- }
+       debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
+                           &fops_dma);
+       debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,