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

ath9k: Simplify checks in quick_scan 



There is a function to do a ratio comparison for ALT,
so make use of it.

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

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

+10 −10
Original line number Diff line number Diff line
@@ -164,11 +164,11 @@ static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb, 
			else

				antcomb->first_ratio = false;

		} else {

			if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&

			      (alt_rssi_avg > main_rssi_avg +

			       ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||

			     (alt_rssi_avg > main_rssi_avg)) &&

			    (antcomb->total_pkt_count > 50))

			if (ath_is_alt_ant_ratio_better(alt_ratio,

						ATH_ANT_DIV_COMB_LNA1_DELTA_HI,

						0,

						main_rssi_avg, alt_rssi_avg,

						antcomb->total_pkt_count))

				antcomb->first_ratio = true;

			else

				antcomb->first_ratio = false;
@@ -219,11 +219,11 @@ static void ath_select_ant_div_from_quick_scan(struct ath_ant_comb *antcomb, 
			else

				antcomb->second_ratio = false;

		} else {

			if ((((alt_ratio >= ATH_ANT_DIV_COMB_ALT_ANT_RATIO2) &&

			      (alt_rssi_avg > main_rssi_avg +

			       ATH_ANT_DIV_COMB_LNA1_DELTA_HI)) ||

			     (alt_rssi_avg > main_rssi_avg)) &&

			    (antcomb->total_pkt_count > 50))

			if (ath_is_alt_ant_ratio_better(alt_ratio,

						ATH_ANT_DIV_COMB_LNA1_DELTA_HI,

						0,

						main_rssi_avg, alt_rssi_avg,

						antcomb->total_pkt_count))

				antcomb->second_ratio = true;

			else

				antcomb->second_ratio = false;