mac80211: more patch reorganization, merge an upstream performance optimization patch

[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
deleted file mode 100644 (file)
index ac94336..0000000
--- a/package/mac80211/patches/550-ath9k_debug_remove_packet_rssi.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -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,
--                      "%22s : %10d\n", "RSSI-CTL0",
--                      sc->debug.stats.rxstats.rs_rssi_ctl0);
--      len += snprintf(buf + len, size - len,
--                      "%22s : %10d\n", "RSSI-CTL1",
--                      sc->debug.stats.rxstats.rs_rssi_ctl1);
--      len += snprintf(buf + len, size - len,
--                      "%22s : %10d\n", "RSSI-CTL2",
--                      sc->debug.stats.rxstats.rs_rssi_ctl2);
--      len += snprintf(buf + len, size - len,
--                      "%22s : %10d\n", "RSSI-EXT0",
--                      sc->debug.stats.rxstats.rs_rssi_ext0);
--      len += snprintf(buf + len, size - len,
--                      "%22s : %10d\n", "RSSI-EXT1",
--                      sc->debug.stats.rxstats.rs_rssi_ext1);
--      len += snprintf(buf + len, size - len,
--                      "%22s : %10d\n", "RSSI-EXT2",
--                      sc->debug.stats.rxstats.rs_rssi_ext2);
--      len += snprintf(buf + len, size - len,
--                      "%22s : %10d\n", "Rx Antenna",
--                      sc->debug.stats.rxstats.rs_antenna);
--      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;
--      sc->debug.stats.rxstats.rs_rssi_ctl1 = rs->rs_rssi_ctl1;
--      sc->debug.stats.rxstats.rs_rssi_ctl2 = rs->rs_rssi_ctl2;
--
--      sc->debug.stats.rxstats.rs_rssi_ext0 = rs->rs_rssi_ext0;
--      sc->debug.stats.rxstats.rs_rssi_ext1 = rs->rs_rssi_ext1;
--      sc->debug.stats.rxstats.rs_rssi_ext2 = rs->rs_rssi_ext2;
--
--      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;
---- a/drivers/net/wireless/ath/ath9k/debug.h
-+++ b/drivers/net/wireless/ath/ath9k/debug.h
-@@ -165,13 +165,6 @@ struct ath_rx_stats {
-       u32 post_delim_crc_err;
-       u32 decrypt_busy_err;
-       u32 phy_err_stats[ATH9K_PHYERR_MAX];
--      int8_t rs_rssi_ctl0;
--      int8_t rs_rssi_ctl1;
--      int8_t rs_rssi_ctl2;
--      int8_t rs_rssi_ext0;
--      int8_t rs_rssi_ext1;
--      int8_t rs_rssi_ext2;
--      u8 rs_antenna;
- };
- 
- enum ath_reset_type {