ath9k: add some more fixes to the mic failure handling rework patch

[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 700cf70..df11fe4 100644 (file)
--- a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
+++ b/package/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
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c

-@@ -1027,6 +1027,53 @@ static const struct file_operations fops
-       .llseek = default_llseek,
+@@ -1181,6 +1181,53 @@ static const struct file_operations fops
+       .llseek = default_llseek,/* read accesses f_pos */

  };
  
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
  };
  
 +static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,


@@ -54,14 +54,13 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);

-@@ -1097,6 +1144,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+@@ -1231,6 +1278,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);
  
        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;
 +
        sc->debug.regidx = 0;
        return 0;

- err:
+ }