mac80211: merge another upstream aggregation 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 2e0e692..91ef8c4 100644 (file)
--- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
@@ -1,9 +1,9 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -950,6 +950,53 @@ static const struct file_operations fops
-       .owner = THIS_MODULE
+@@ -1616,6 +1616,53 @@ static const struct file_operations fops
  };
  
+ 
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
 +                           size_t count, loff_t *ppos)
 +{
@@ -54,14 +54,13 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -1013,6 +1060,10 @@ int ath9k_init_debug(struct ath_hw *ah)
-                       sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
-               goto err;
+@@ -1674,6 +1721,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);
  
-+      if (!debugfs_create_file("eeprom", S_IRUSR,
-+                      sc->debug.debugfs_phy, sc, &fops_eeprom))
-+              goto err;
++      debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
++                          &fops_eeprom);
 +
        sc->debug.regidx = 0;
-       return 0;
- err:
+       memset(&sc->debug.bb_mac_samp, 0, sizeof(sc->debug.bb_mac_samp));
+       sc->debug.sampidx = 0;