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

Commit 671adc93 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: remove remaining qual code 



This removes the remaining users of the rx status
'qual' field and the field itself.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5e312589

drivers/net/wireless/ath/ath5k/base.c

+0 −11
Original line number Diff line number Diff line
@@ -1903,17 +1903,6 @@ ath5k_tasklet_rx(unsigned long data) 
		rxs->noise = sc->ah->ah_noise_floor;

		rxs->signal = rxs->noise + rs.rs_rssi;



		/* An rssi of 35 indicates you should be able use

		 * 54 Mbps reliably. A more elaborate scheme can be used

		 * here but it requires a map of SNR/throughput for each

		 * possible mode used */

		rxs->qual = rs.rs_rssi * 100 / 35;



		/* rssi can be more than 35 though, anything above that

		 * should be considered at 100% */

		if (rxs->qual > 100)

			rxs->qual = 100;



		rxs->antenna = rs.rs_antenna;

		rxs->rate_idx = ath5k_hw_to_driver_rix(sc, rs.rs_rate);

		rxs->flag |= ath5k_rx_decrypted(sc, ds, skb, &rs);

drivers/net/wireless/iwlwifi/iwl-3945.c

+2 −8
Original line number Diff line number Diff line
@@ -681,19 +681,13 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv, 
		snr = rx_stats_sig_avg / rx_stats_noise_diff;

		rx_status.noise = rx_status.signal -

					iwl3945_calc_db_from_ratio(snr);

		rx_status.qual = iwl3945_calc_sig_qual(rx_status.signal,

							 rx_status.noise);



	/* If noise info not available, calculate signal quality indicator (%)

	 *   using just the dBm signal level. */

	} else {

		rx_status.noise = priv->last_rx_noise;

		rx_status.qual = iwl3945_calc_sig_qual(rx_status.signal, 0);

	}





	IWL_DEBUG_STATS(priv, "Rssi %d noise %d qual %d sig_avg %d noise_diff %d\n",

			rx_status.signal, rx_status.noise, rx_status.qual,

	IWL_DEBUG_STATS(priv, "Rssi %d noise %d sig_avg %d noise_diff %d\n",

			rx_status.signal, rx_status.noise,

			rx_stats_sig_avg, rx_stats_noise_diff);



	header = (struct ieee80211_hdr *)IWL_RX_DATA(pkt);

drivers/net/wireless/iwlwifi/iwl-3945.h

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ struct iwl3945_ibss_seq { 
 *

 *****************************************************************************/

extern int iwl3945_calc_db_from_ratio(int sig_ratio);

extern int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm);

extern void iwl3945_rx_replenish(void *data);

extern void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq);

extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,

drivers/net/wireless/iwlwifi/iwl-rx.c

+2 −46
Original line number Diff line number Diff line
@@ -650,47 +650,6 @@ void iwl_reply_statistics(struct iwl_priv *priv, 
}

EXPORT_SYMBOL(iwl_reply_statistics);



#define PERFECT_RSSI (-20) /* dBm */

#define WORST_RSSI (-95)   /* dBm */

#define RSSI_RANGE (PERFECT_RSSI - WORST_RSSI)



/* Calculate an indication of rx signal quality (a percentage, not dBm!).

 * See http://www.ces.clemson.edu/linux/signal_quality.shtml for info

 *   about formulas used below. */

static int iwl_calc_sig_qual(int rssi_dbm, int noise_dbm)

{

	int sig_qual;

	int degradation = PERFECT_RSSI - rssi_dbm;



	/* If we get a noise measurement, use signal-to-noise ratio (SNR)

	 * as indicator; formula is (signal dbm - noise dbm).

	 * SNR at or above 40 is a great signal (100%).

	 * Below that, scale to fit SNR of 0 - 40 dB within 0 - 100% indicator.

	 * Weakest usable signal is usually 10 - 15 dB SNR. */

	if (noise_dbm) {

		if (rssi_dbm - noise_dbm >= 40)

			return 100;

		else if (rssi_dbm < noise_dbm)

			return 0;

		sig_qual = ((rssi_dbm - noise_dbm) * 5) / 2;



	/* Else use just the signal level.

	 * This formula is a least squares fit of data points collected and

	 *   compared with a reference system that had a percentage (%) display

	 *   for signal quality. */

	} else

		sig_qual = (100 * (RSSI_RANGE * RSSI_RANGE) - degradation *

			    (15 * RSSI_RANGE + 62 * degradation)) /

			   (RSSI_RANGE * RSSI_RANGE);



	if (sig_qual > 100)

		sig_qual = 100;

	else if (sig_qual < 1)

		sig_qual = 0;



	return sig_qual;

}



/* Calc max signal level (dBm) among 3 possible receivers */

static inline int iwl_calc_rssi(struct iwl_priv *priv,

				struct iwl_rx_phy_res *rx_resp)
@@ -1101,11 +1060,8 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, 
	if (iwl_is_associated(priv) &&

	    !test_bit(STATUS_SCANNING, &priv->status)) {

		rx_status.noise = priv->last_rx_noise;

		rx_status.qual = iwl_calc_sig_qual(rx_status.signal,

							 rx_status.noise);

	} else {

		rx_status.noise = IWL_NOISE_MEAS_NOT_AVAILABLE;

		rx_status.qual = iwl_calc_sig_qual(rx_status.signal, 0);

	}



	/* Reset beacon noise level if not associated. */
@@ -1118,8 +1074,8 @@ void iwl_rx_reply_rx(struct iwl_priv *priv, 
		iwl_dbg_report_frame(priv, phy_res, len, header, 1);

#endif

	iwl_dbg_log_rx_data_frame(priv, len, header);

	IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, noise %d, qual %d, TSF %llu\n",

		rx_status.signal, rx_status.noise, rx_status.qual,

	IWL_DEBUG_STATS_LIMIT(priv, "Rssi %d, noise %d, TSF %llu\n",

		rx_status.signal, rx_status.noise,

		(unsigned long long)rx_status.mactime);



	/*

drivers/net/wireless/iwlwifi/iwl3945-base.c

+0 −41
Original line number Diff line number Diff line
@@ -1299,47 +1299,6 @@ int iwl3945_calc_db_from_ratio(int sig_ratio) 
	return (int)ratio2dB[sig_ratio];

}



#define PERFECT_RSSI (-20) /* dBm */

#define WORST_RSSI (-95)   /* dBm */

#define RSSI_RANGE (PERFECT_RSSI - WORST_RSSI)



/* Calculate an indication of rx signal quality (a percentage, not dBm!).

 * See http://www.ces.clemson.edu/linux/signal_quality.shtml for info

 *   about formulas used below. */

int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm)

{

	int sig_qual;

	int degradation = PERFECT_RSSI - rssi_dbm;



	/* If we get a noise measurement, use signal-to-noise ratio (SNR)

	 * as indicator; formula is (signal dbm - noise dbm).

	 * SNR at or above 40 is a great signal (100%).

	 * Below that, scale to fit SNR of 0 - 40 dB within 0 - 100% indicator.

	 * Weakest usable signal is usually 10 - 15 dB SNR. */

	if (noise_dbm) {

		if (rssi_dbm - noise_dbm >= 40)

			return 100;

		else if (rssi_dbm < noise_dbm)

			return 0;

		sig_qual = ((rssi_dbm - noise_dbm) * 5) / 2;



	/* Else use just the signal level.

	 * This formula is a least squares fit of data points collected and

	 *   compared with a reference system that had a percentage (%) display

	 *   for signal quality. */

	} else

		sig_qual = (100 * (RSSI_RANGE * RSSI_RANGE) - degradation *

			    (15 * RSSI_RANGE + 62 * degradation)) /

			   (RSSI_RANGE * RSSI_RANGE);



	if (sig_qual > 100)

		sig_qual = 100;

	else if (sig_qual < 1)

		sig_qual = 0;



	return sig_qual;

}



/**

 * iwl3945_rx_handle - Main entry function for receiving responses from uCode

 *