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

Commit a783f1ee authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[PATCH] libertas: remove adapter->{data,bcn}_avg_factor 



Those two variables were initialized with some default values, but there
is no code that would ever change them. So we could use as well the defaults
directly.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent caef47a0

drivers/net/wireless/libertas/cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ static int wlan_cmd_802_11_rssi(wlan_private * priv, 
	lbs_deb_enter(LBS_DEB_CMD);

	cmd->command = cpu_to_le16(CMD_802_11_RSSI);

	cmd->size = cpu_to_le16(sizeof(struct cmd_ds_802_11_rssi) + S_DS_GEN);

	cmd->params.rssi.N = cpu_to_le16(priv->adapter->bcn_avg_factor);

	cmd->params.rssi.N = cpu_to_le16(DEFAULT_BCN_AVG_FACTOR);



	/* reset Beacon SNR/NF/RSSI values */

	adapter->SNR[TYPE_BEACON][TYPE_NOAVG] = 0;

drivers/net/wireless/libertas/dev.h

+0 −2
Original line number Diff line number Diff line
@@ -334,8 +334,6 @@ struct _wlan_adapter { 
	u8 wpa_ie_len;



	/** Requested Signal Strength*/

	u16 bcn_avg_factor;

	u16 data_avg_factor;

	u16 SNR[MAX_TYPE_B][MAX_TYPE_AVG];

	u16 NF[MAX_TYPE_B][MAX_TYPE_AVG];

	u8 RSSI[MAX_TYPE_B][MAX_TYPE_AVG];

drivers/net/wireless/libertas/main.c

+0 −3
Original line number Diff line number Diff line
@@ -998,9 +998,6 @@ static void wlan_init_adapter(wlan_private * priv) 
	wlan_adapter *adapter = priv->adapter;

	int i;



	adapter->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR;

	adapter->data_avg_factor = DEFAULT_DATA_AVG_FACTOR;



	/* ATIM params */

	adapter->atimwindow = 0;

drivers/net/wireless/libertas/rx.c

+2 −2
Original line number Diff line number Diff line
@@ -85,12 +85,12 @@ static u8 wlan_getavgnf(wlan_private * priv) 
static void wlan_save_rawSNRNF(wlan_private * priv, struct rxpd *p_rx_pd)

{

	wlan_adapter *adapter = priv->adapter;

	if (adapter->numSNRNF < adapter->data_avg_factor)

	if (adapter->numSNRNF < DEFAULT_DATA_AVG_FACTOR)

		adapter->numSNRNF++;

	adapter->rawSNR[adapter->nextSNRNF] = p_rx_pd->snr;

	adapter->rawNF[adapter->nextSNRNF] = p_rx_pd->nf;

	adapter->nextSNRNF++;

	if (adapter->nextSNRNF >= adapter->data_avg_factor)

	if (adapter->nextSNRNF >= DEFAULT_DATA_AVG_FACTOR)

		adapter->nextSNRNF = 0;

	return;

}