mac80211: fix a WARN_ON in client mode

[openwrt.git] / package / mac80211 / patches / 520-ath9k_debugfs_regaccess.patch

diff --git a/package/mac80211/patches/520-ath9k_debugfs_regaccess.patch b/package/mac80211/patches/520-ath9k_debugfs_regaccess.patch
index b927b55..02e4cac 100644 (file)
--- a/package/mac80211/patches/520-ath9k_debugfs_regaccess.patch
+++ b/package/mac80211/patches/520-ath9k_debugfs_regaccess.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -638,6 +638,86 @@ static const struct file_operations fops
+@@ -774,6 +774,86 @@ static const struct file_operations fops
        .owner = THIS_MODULE
  };
  
@@ -87,8 +87,8 @@
  int ath9k_init_debug(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
-@@ -700,6 +780,17 @@ int ath9k_init_debug(struct ath_hw *ah)
-       if (!sc->debug.debugfs_xmit)
+@@ -843,6 +923,17 @@ int ath9k_init_debug(struct ath_hw *ah)
+       if (!sc->debug.debugfs_recv)
                goto err;
  
 +      sc->debug.regidx = 0;
@@ -105,21 +105,21 @@
        return 0;
  err:
        ath9k_exit_debug(ah);
-@@ -713,6 +804,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
+@@ -856,6 +947,8 @@ void ath9k_exit_debug(struct ath_hw *ah)
  
        debugfs_remove(sc->debug.debugfs_tx_chainmask);
        debugfs_remove(sc->debug.debugfs_rx_chainmask);
 +      debugfs_remove(sc->debug.debugfs_regval);
 +      debugfs_remove(sc->debug.debugfs_regidx);
+       debugfs_remove(sc->debug.debugfs_recv);
        debugfs_remove(sc->debug.debugfs_xmit);
        debugfs_remove(sc->debug.debugfs_wiphy);
-       debugfs_remove(sc->debug.debugfs_rcstat);
 --- a/drivers/net/wireless/ath/ath9k/debug.h
 +++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -132,6 +132,9 @@ struct ath9k_debug {
-       struct dentry *debugfs_rcstat;
+@@ -158,6 +158,9 @@ struct ath9k_debug {
        struct dentry *debugfs_wiphy;
        struct dentry *debugfs_xmit;
+       struct dentry *debugfs_recv;
 +      struct dentry *debugfs_regidx;
 +      struct dentry *debugfs_regval;
 +      u32 regidx;