ath9k: merge a fix for hardware full sleep

[openwrt.git] / package / mac80211 / patches / 550-ath9k_debug_remove_packet_rssi.patch

diff --git a/package/mac80211/patches/550-ath9k_debug_remove_packet_rssi.patch b/package/mac80211/patches/550-ath9k_debug_remove_packet_rssi.patch
index 79eaf86..ac94336 100644 (file)
--- a/package/mac80211/patches/550-ath9k_debug_remove_packet_rssi.patch
+++ b/package/mac80211/patches/550-ath9k_debug_remove_packet_rssi.patch
@@ -1,42 +1,35 @@
 --- a/drivers/net/wireless/ath/ath9k/debug.c
 +++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -963,34 +963,6 @@ static ssize_t read_file_recv(struct fil
-                       "%18s : %10u\n", "DECRYPT BUSY ERR",
-                       sc->debug.stats.rxstats.decrypt_busy_err);
+@@ -944,27 +944,6 @@ static ssize_t read_file_recv(struct fil
+       PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL);
  
--      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "RSSI-CTL0",
+       len += snprintf(buf + len, size - len,
+-                      "%22s : %10d\n", "RSSI-CTL0",
 -                      sc->debug.stats.rxstats.rs_rssi_ctl0);
--
 -      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "RSSI-CTL1",
+-                      "%22s : %10d\n", "RSSI-CTL1",
 -                      sc->debug.stats.rxstats.rs_rssi_ctl1);
--
 -      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "RSSI-CTL2",
+-                      "%22s : %10d\n", "RSSI-CTL2",
 -                      sc->debug.stats.rxstats.rs_rssi_ctl2);
--
 -      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "RSSI-EXT0",
+-                      "%22s : %10d\n", "RSSI-EXT0",
 -                      sc->debug.stats.rxstats.rs_rssi_ext0);
--
 -      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "RSSI-EXT1",
+-                      "%22s : %10d\n", "RSSI-EXT1",
 -                      sc->debug.stats.rxstats.rs_rssi_ext1);
--
 -      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "RSSI-EXT2",
+-                      "%22s : %10d\n", "RSSI-EXT2",
 -                      sc->debug.stats.rxstats.rs_rssi_ext2);
--
 -      len += snprintf(buf + len, size - len,
--                      "%18s : %10d\n", "Rx Antenna",
+-                      "%22s : %10d\n", "Rx Antenna",
 -                      sc->debug.stats.rxstats.rs_antenna);
--
-       PHY_ERR("UNDERRUN", ATH9K_PHYERR_UNDERRUN);
-       PHY_ERR("TIMING", ATH9K_PHYERR_TIMING);
-       PHY_ERR("PARITY", ATH9K_PHYERR_PARITY);
-@@ -1067,16 +1039,6 @@ void ath_debug_stat_rx(struct ath_softc 
-               RX_PHY_ERR_INC(phyerr);
+-      len += snprintf(buf + len, size - len,
+                       "%22s : %10u\n", "RX-Pkts-All",
+                       sc->debug.stats.rxstats.rx_pkts_all);
+       len += snprintf(buf + len, size - len,
+@@ -1011,16 +990,6 @@ void ath_debug_stat_rx(struct ath_softc 
+                       RX_PHY_ERR_INC(rs->rs_phyerr);
        }
  
 -      sc->debug.stats.rxstats.rs_rssi_ctl0 = rs->rs_rssi_ctl0;
@@ -49,12 +42,12 @@
 -
 -      sc->debug.stats.rxstats.rs_antenna = rs->rs_antenna;
 -
+ #ifdef CONFIG_ATH9K_MAC_DEBUG
        spin_lock(&sc->debug.samp_lock);
        RX_SAMP_DBG(jiffies) = jiffies;
-       RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl0;
 --- a/drivers/net/wireless/ath/ath9k/debug.h
 +++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -164,13 +164,6 @@ struct ath_rx_stats {
+@@ -165,13 +165,6 @@ struct ath_rx_stats {
        u32 post_delim_crc_err;
        u32 decrypt_busy_err;
        u32 phy_err_stats[ATH9K_PHYERR_MAX];