Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3acd13d authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Handle invalid RSSI 



The combined RSSI can be invalid which is indicated by
the value -128. Use RX_FLAG_NO_SIGNAL_VAL for such cases.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea3ef101

drivers/net/wireless/ath/ath9k/recv.c

+33 −16
Original line number Diff line number Diff line
@@ -885,31 +885,51 @@ static int ath9k_process_rate(struct ath_common *common, 


static void ath9k_process_rssi(struct ath_common *common,

			       struct ieee80211_hw *hw,

			       struct ath_rx_status *rx_stats)

			       struct ath_rx_status *rx_stats,

			       struct ieee80211_rx_status *rxs)

{

	struct ath_softc *sc = hw->priv;

	struct ath_hw *ah = common->ah;

	int last_rssi;

	int rssi = rx_stats->rs_rssi;



	if (!rx_stats->is_mybeacon ||

	    ((ah->opmode != NL80211_IFTYPE_STATION) &&

	     (ah->opmode != NL80211_IFTYPE_ADHOC)))

	/*

	 * RSSI is not available for subframes in an A-MPDU.

	 */

	if (rx_stats->rs_moreaggr) {

		rxs->flag |= RX_FLAG_NO_SIGNAL_VAL;

		return;

	}



	if (rx_stats->rs_rssi != ATH9K_RSSI_BAD && !rx_stats->rs_moreaggr)

		ATH_RSSI_LPF(sc->last_rssi, rx_stats->rs_rssi);

	/*

	 * Check if the RSSI for the last subframe in an A-MPDU

	 * or an unaggregated frame is valid.

	 */

	if (rx_stats->rs_rssi == ATH9K_RSSI_BAD) {

		rxs->flag |= RX_FLAG_NO_SIGNAL_VAL;

		return;

	}



	/*

	 * Update Beacon RSSI, this is used by ANI.

	 */

	if (rx_stats->is_mybeacon &&

	    ((ah->opmode == NL80211_IFTYPE_STATION) ||

	     (ah->opmode == NL80211_IFTYPE_ADHOC))) {

		ATH_RSSI_LPF(sc->last_rssi, rx_stats->rs_rssi);

		last_rssi = sc->last_rssi;



		if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER))

			rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER);

		if (rssi < 0)

			rssi = 0;



	/* Update Beacon RSSI, this is used by ANI. */

		ah->stats.avgbrssi = rssi;

	}



	rxs->signal = ah->noise + rx_stats->rs_rssi;

}



static void ath9k_process_tsf(struct ath_rx_status *rs,

			      struct ieee80211_rx_status *rxs,

			      u64 tsf)
@@ -1149,15 +1169,12 @@ static int ath9k_rx_skb_preprocess(struct ath_softc *sc, 
		goto exit;

	}



	ath9k_process_rssi(common, hw, rx_stats);

	ath9k_process_rssi(common, hw, rx_stats, rx_status);



	rx_status->band = hw->conf.chandef.chan->band;

	rx_status->freq = hw->conf.chandef.chan->center_freq;

	rx_status->signal = ah->noise + rx_stats->rs_rssi;

	rx_status->antenna = rx_stats->rs_antenna;

	rx_status->flag |= RX_FLAG_MACTIME_END;

	if (rx_stats->rs_moreaggr)

		rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;



#ifdef CONFIG_ATH9K_BTCOEX_SUPPORT

	if (ieee80211_is_data_present(hdr->frame_control) &&