ath9k: improve ANI debugfs file

[openwrt.git] / package / kernel / mac80211 / patches / 300-pending_work.patch

diff --git a/package/kernel/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
index 8b044d2..15c04cd 100644 (file)
--- a/package/kernel/mac80211/patches/300-pending_work.patch
+++ b/package/kernel/mac80211/patches/300-pending_work.patch
@@ -1,3 +1,13 @@
+commit 8d804f1af11e4e058b1e8453327777d73a585cb8
+Author: Felix Fietkau <nbd@openwrt.org>
+Date:   Sun Mar 9 11:25:43 2014 +0100
+
+    ath9k: clean up and enhance ANI debugfs file
+    
+    Unify scnprintf calls and include the current OFDM/CCK immunity level.
+    
+    Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+
 commit 22e298b5a3a8a49e33805d4e351965123dede35b
 Author: Felix Fietkau <nbd@openwrt.org>
 Date:   Sun Mar 9 10:58:47 2014 +0100
@@ -3577,7 +3587,79 @@ Date:   Thu Jan 23 20:06:34 2014 +0100
                schedule_delayed_work(&reg_timeout, msecs_to_jiffies(3142));
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -866,6 +866,12 @@ static ssize_t read_file_reset(struct fi
+@@ -138,43 +138,41 @@ static ssize_t read_file_ani(struct file
+       unsigned int len = 0, size = 1024;
+       ssize_t retval = 0;
+       char *buf;
++      int i;
++      struct {
++              const char *name;
++              unsigned int val;
++      } ani_info[] = {
++              { "ANI RESET", ah->stats.ast_ani_reset },
++              { "OFDM LEVEL", ah->ani.ofdmNoiseImmunityLevel },
++              { "CCK LEVEL", ah->ani.cckNoiseImmunityLevel },
++              { "SPUR UP", ah->stats.ast_ani_spurup },
++              { "SPUR DOWN", ah->stats.ast_ani_spurup },
++              { "OFDM WS-DET ON", ah->stats.ast_ani_ofdmon },
++              { "OFDM WS-DET OFF", ah->stats.ast_ani_ofdmoff },
++              { "MRC-CCK ON", ah->stats.ast_ani_ccklow },
++              { "MRC-CCK OFF", ah->stats.ast_ani_cckhigh },
++              { "FIR-STEP UP", ah->stats.ast_ani_stepup },
++              { "FIR-STEP DOWN", ah->stats.ast_ani_stepdown },
++              { "INV LISTENTIME", ah->stats.ast_ani_lneg_or_lzero },
++              { "OFDM ERRORS", ah->stats.ast_ani_ofdmerrs },
++              { "CCK ERRORS", ah->stats.ast_ani_cckerrs },
++      };
+ 
+       buf = kzalloc(size, GFP_KERNEL);
+       if (buf == NULL)
+               return -ENOMEM;
+ 
+-      if (common->disable_ani) {
+-              len += scnprintf(buf + len, size - len, "%s: %s\n",
+-                               "ANI", "DISABLED");
++      len += scnprintf(buf + len, size - len, "%15s: %s\n", "ANI",
++                       common->disable_ani ? "DISABLED" : "ENABLED");
++
++      if (common->disable_ani)
+               goto exit;
+-      }
+ 
+-      len += scnprintf(buf + len, size - len, "%15s: %s\n",
+-                       "ANI", "ENABLED");
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "ANI RESET", ah->stats.ast_ani_reset);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "SPUR UP", ah->stats.ast_ani_spurup);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "SPUR DOWN", ah->stats.ast_ani_spurup);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "OFDM WS-DET ON", ah->stats.ast_ani_ofdmon);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "OFDM WS-DET OFF", ah->stats.ast_ani_ofdmoff);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "MRC-CCK ON", ah->stats.ast_ani_ccklow);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "MRC-CCK OFF", ah->stats.ast_ani_cckhigh);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "FIR-STEP UP", ah->stats.ast_ani_stepup);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "FIR-STEP DOWN", ah->stats.ast_ani_stepdown);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "INV LISTENTIME", ah->stats.ast_ani_lneg_or_lzero);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "OFDM ERRORS", ah->stats.ast_ani_ofdmerrs);
+-      len += scnprintf(buf + len, size - len, "%15s: %u\n",
+-                       "CCK ERRORS", ah->stats.ast_ani_cckerrs);
++      for (i = 0; i < ARRAY_SIZE(ani_info); i++)
++              len += scnprintf(buf + len, size - len, "%15s: %u\n",
++                               ani_info[i].name, ani_info[i].val);
++
+ exit:
+       if (len > size)
+               len = size;
+@@ -866,6 +864,12 @@ static ssize_t read_file_reset(struct fi
                         "%17s: %2d\n", "PLL RX Hang",
                         sc->debug.stats.reset[RESET_TYPE_PLL_HANG]);
        len += scnprintf(buf + len, sizeof(buf) - len,