mac80211: update to wireless-testing 2013-06-13 + latest backport infrastructure

[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 522-ath9k_per_chain_signal_strength.patch

diff --git a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
index 6aac4389f7f23e7598d1ab254e166c8fdff30441..50dbcd9902fcbf637a56d58a2aa07a07acee641b 100644 (file)
--- a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
+++ b/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
@@ -17,7 +17,7 @@
        u8 rs_num_delims;
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -950,6 +950,7 @@ static int ath9k_rx_skb_preprocess(struc
+@@ -939,6 +939,7 @@ static int ath9k_rx_skb_preprocess(struc
        struct ath_hw *ah = sc->sc_ah;
        struct ath_common *common = ath9k_hw_common(ah);
        bool discard_current = sc->rx.discard_next;
@@ -25,7 +25,7 @@
  
        sc->rx.discard_next = rx_stats->rs_more;
        if (discard_current)
-@@ -979,6 +980,21 @@ static int ath9k_rx_skb_preprocess(struc
+@@ -968,6 +969,21 @@ static int ath9k_rx_skb_preprocess(struc
        if (rx_stats->rs_moreaggr)
                rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
  
@@ -47,7 +47,7 @@
        sc->rx.discard_next = false;
        return 0;
  }
-@@ -1088,7 +1104,7 @@ static int ath_process_fft(struct ath_so
+@@ -1077,7 +1093,7 @@ static int ath_process_fft(struct ath_so
        fft_sample.tlv.length = __cpu_to_be16(length);
  
        fft_sample.freq = __cpu_to_be16(ah->curchan->chan->center_freq);
@@ -58,7 +58,7 @@
        switch (len - SPECTRAL_HT20_TOTAL_DATA_LEN) {
 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -475,12 +475,12 @@ int ath9k_hw_process_rxdesc_edma(struct 
+@@ -476,12 +476,12 @@ int ath9k_hw_process_rxdesc_edma(struct 
  
        /* XXX: Keycache */
        rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined);
@@ -79,7 +79,7 @@
                rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);
 --- a/drivers/net/wireless/ath/ath9k/mac.c
 +++ b/drivers/net/wireless/ath/ath9k/mac.c
-@@ -553,25 +553,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
+@@ -554,25 +554,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
  
        if (ads.ds_rxstatus8 & AR_PostDelimCRCErr) {
                rs->rs_rssi = ATH9K_RSSI_BAD;
@@ -117,30 +117,9 @@
                                                AR_RxRSSIAnt12);
        }
        if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -943,12 +943,12 @@ void ath_debug_stat_rx(struct ath_softc 
- #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;
--      RX_SAMP_DBG(rssi_ctl1) = rs->rs_rssi_ctl1;
--      RX_SAMP_DBG(rssi_ctl2) = rs->rs_rssi_ctl2;
--      RX_SAMP_DBG(rssi_ext0) = rs->rs_rssi_ext0;
--      RX_SAMP_DBG(rssi_ext1) = rs->rs_rssi_ext1;
--      RX_SAMP_DBG(rssi_ext2) = rs->rs_rssi_ext2;
-+      RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl[0];
-+      RX_SAMP_DBG(rssi_ctl1) = rs->rs_rssi_ctl[1];
-+      RX_SAMP_DBG(rssi_ctl2) = rs->rs_rssi_ctl[2];
-+      RX_SAMP_DBG(rssi_ext0) = rs->rs_rssi_ext[0];
-+      RX_SAMP_DBG(rssi_ext1) = rs->rs_rssi_ext[1];
-+      RX_SAMP_DBG(rssi_ext2) = rs->rs_rssi_ext[2];
-       RX_SAMP_DBG(antenna) = rs->rs_antenna;
-       RX_SAMP_DBG(rssi) = rs->rs_rssi;
-       RX_SAMP_DBG(rate) = rs->rs_rate;
 --- a/drivers/net/wireless/ath/ath9k/dfs.c
 +++ b/drivers/net/wireless/ath/ath9k/dfs.c
-@@ -164,8 +164,8 @@ void ath9k_dfs_process_phyerr(struct ath
+@@ -158,8 +158,8 @@ void ath9k_dfs_process_phyerr(struct ath
                return;
        }