ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-27 09:12:39 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
ab3982a841
openwrt/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch

175 lines
6.2 KiB
Diff
Raw Normal View History

ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -133,12 +133,8 @@ struct ath_rx_status {
u8 rs_rate;
u8 rs_antenna;
u8 rs_more;
- 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;
+ int8_t rs_rssi_ctl[3];
+ int8_t rs_rssi_ext[3];
u8 rs_isaggr;
u8 rs_moreaggr;
u8 rs_num_delims;
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
mac80211: update to wireless-testing 2013-04-16 + backports Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36448
2013-04-26 10:52:03 +00:00
@@ -950,6 +950,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;
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
+ int i, j;
mac80211: update to wireless-testing 2013-04-16 + backports Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36448
2013-04-26 10:52:03 +00:00
sc->rx.discard_next = rx_stats->rs_more;
if (discard_current)
@@ -979,6 +980,21 @@ static int ath9k_rx_skb_preprocess(struc
mac80211: reorganize patches, fold in patches that were merged upstream SVN-Revision: 30863
2012-03-10 12:59:24 +00:00
if (rx_stats->rs_moreaggr)
rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
+ for (i = 0, j = 0; i < ARRAY_SIZE(rx_stats->rs_rssi_ctl); i++) {
+ s8 rssi;
+
+ if (!(ah->rxchainmask & BIT(i)))
+ continue;
+
+ rssi = rx_stats->rs_rssi_ctl[i];
+ if (rssi != ATH9K_RSSI_BAD) {
+ rx_status->chains |= BIT(j);
+ rx_status->chain_signal[j] = ah->noise + rssi;
+ }
+ j++;
+ }
+
mac80211: update to wireless-testing 2013-04-16 + backports Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36448
2013-04-26 10:52:03 +00:00
+
sc->rx.discard_next = false;
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
return 0;
}
mac80211: update to wireless-testing 2013-04-16 + backports Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36448
2013-04-26 10:52:03 +00:00
@@ -1088,7 +1104,7 @@ static int ath_process_fft(struct ath_so
mac80211: update to wireless-testing 2013-02-22 SVN-Revision: 35753
2013-02-23 01:12:36 +00:00
fft_sample.tlv.length = __cpu_to_be16(length);
fft_sample.freq = __cpu_to_be16(ah->curchan->chan->center_freq);
- fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
+ fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
fft_sample.noise = ah->noise;
switch (len - SPECTRAL_HT20_TOTAL_DATA_LEN) {
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
mac80211: merge an idle handling fix (fixes ath9k_htc client mode), refresh patches Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36265
2013-04-07 22:05:36 +00:00
@@ -475,12 +475,12 @@ int ath9k_hw_process_rxdesc_edma(struct
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
/* XXX: Keycache */
rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined);
- rxs->rs_rssi_ctl0 = MS(rxsp->status1, AR_RxRSSIAnt00);
- rxs->rs_rssi_ctl1 = MS(rxsp->status1, AR_RxRSSIAnt01);
- rxs->rs_rssi_ctl2 = MS(rxsp->status1, AR_RxRSSIAnt02);
- rxs->rs_rssi_ext0 = MS(rxsp->status5, AR_RxRSSIAnt10);
- rxs->rs_rssi_ext1 = MS(rxsp->status5, AR_RxRSSIAnt11);
- rxs->rs_rssi_ext2 = MS(rxsp->status5, AR_RxRSSIAnt12);
+ rxs->rs_rssi_ctl[0] = MS(rxsp->status1, AR_RxRSSIAnt00);
+ rxs->rs_rssi_ctl[1] = MS(rxsp->status1, AR_RxRSSIAnt01);
+ rxs->rs_rssi_ctl[2] = MS(rxsp->status1, AR_RxRSSIAnt02);
+ rxs->rs_rssi_ext[0] = MS(rxsp->status5, AR_RxRSSIAnt10);
+ rxs->rs_rssi_ext[1] = MS(rxsp->status5, AR_RxRSSIAnt11);
+ rxs->rs_rssi_ext[2] = MS(rxsp->status5, AR_RxRSSIAnt12);
if (rxsp->status11 & AR_RxKeyIdxValid)
rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
mac80211: update to wireless-testing 2012-04-13 SVN-Revision: 31322
2012-04-16 21:08:41 +00:00
@@ -553,25 +553,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
if (ads.ds_rxstatus8 & AR_PostDelimCRCErr) {
rs->rs_rssi = ATH9K_RSSI_BAD;
- rs->rs_rssi_ctl0 = ATH9K_RSSI_BAD;
- rs->rs_rssi_ctl1 = ATH9K_RSSI_BAD;
- rs->rs_rssi_ctl2 = ATH9K_RSSI_BAD;
- rs->rs_rssi_ext0 = ATH9K_RSSI_BAD;
- rs->rs_rssi_ext1 = ATH9K_RSSI_BAD;
- rs->rs_rssi_ext2 = ATH9K_RSSI_BAD;
+ rs->rs_rssi_ctl[0] = ATH9K_RSSI_BAD;
+ rs->rs_rssi_ctl[1] = ATH9K_RSSI_BAD;
+ rs->rs_rssi_ctl[2] = ATH9K_RSSI_BAD;
+ rs->rs_rssi_ext[0] = ATH9K_RSSI_BAD;
+ rs->rs_rssi_ext[1] = ATH9K_RSSI_BAD;
+ rs->rs_rssi_ext[2] = ATH9K_RSSI_BAD;
} else {
rs->rs_rssi = MS(ads.ds_rxstatus4, AR_RxRSSICombined);
- rs->rs_rssi_ctl0 = MS(ads.ds_rxstatus0,
+ rs->rs_rssi_ctl[0] = MS(ads.ds_rxstatus0,
AR_RxRSSIAnt00);
- rs->rs_rssi_ctl1 = MS(ads.ds_rxstatus0,
+ rs->rs_rssi_ctl[1] = MS(ads.ds_rxstatus0,
AR_RxRSSIAnt01);
- rs->rs_rssi_ctl2 = MS(ads.ds_rxstatus0,
+ rs->rs_rssi_ctl[2] = MS(ads.ds_rxstatus0,
AR_RxRSSIAnt02);
- rs->rs_rssi_ext0 = MS(ads.ds_rxstatus4,
+ rs->rs_rssi_ext[0] = MS(ads.ds_rxstatus4,
AR_RxRSSIAnt10);
- rs->rs_rssi_ext1 = MS(ads.ds_rxstatus4,
+ rs->rs_rssi_ext[1] = MS(ads.ds_rxstatus4,
AR_RxRSSIAnt11);
- rs->rs_rssi_ext2 = MS(ads.ds_rxstatus4,
+ rs->rs_rssi_ext[2] = MS(ads.ds_rxstatus4,
AR_RxRSSIAnt12);
}
if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
mac80211: update to wireless-testing 2013-04-16 + backports Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36448
2013-04-26 10:52:03 +00:00
@@ -943,12 +943,12 @@ void ath_debug_stat_rx(struct ath_softc
ath9k: disable MAC sample debugging, it is almost never used and wastes precious CPU cycles SVN-Revision: 30764
2012-03-01 15:13:33 +00:00
#ifdef CONFIG_ATH9K_MAC_DEBUG
ath9k: add support for per-chain signal strength info SVN-Revision: 28384
2011-10-08 14:48:23 +00:00
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;
mac80211: update to wireless-testing 2012-06-14 SVN-Revision: 32420
2012-06-18 01:26:36 +00:00
--- 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
return;
}
- ard.rssi = rs->rs_rssi_ctl0;
- ard.ext_rssi = rs->rs_rssi_ext0;
+ ard.rssi = rs->rs_rssi_ctl[0];
+ ard.ext_rssi = rs->rs_rssi_ext[0];
/*
* hardware stores this as 8 bit signed value.
--- a/drivers/net/wireless/ath/ath9k/antenna.c
+++ b/drivers/net/wireless/ath/ath9k/antenna.c
mac80211: merge an idle handling fix (fixes ath9k_htc client mode), refresh patches Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36265
2013-04-07 22:05:36 +00:00
@@ -546,14 +546,14 @@ void ath_ant_comb_scan(struct ath_softc
mac80211: update to wireless-testing 2012-06-14 SVN-Revision: 32420
2012-06-18 01:26:36 +00:00
struct ath_ant_comb *antcomb = &sc->ant_comb;
int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
int curr_main_set;
- int main_rssi = rs->rs_rssi_ctl0;
- int alt_rssi = rs->rs_rssi_ctl1;
+ int main_rssi = rs->rs_rssi_ctl[0];
+ int alt_rssi = rs->rs_rssi_ctl[1];
int rx_ant_conf, main_ant_conf;
bool short_scan = false;
- rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
+ rx_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_CURRENT_SHIFT) &
ATH_ANT_RX_MASK;
- main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
+ main_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_MAIN_SHIFT) &
ATH_ANT_RX_MASK;
/* Record packet only when both main_rssi and alt_rssi is positive */
Reference in New Issue Copy Permalink