Commit 958a4a86 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: remove redundant signal handling code 



1) The wrapper function mwifiex_get_signal_info() is unnecessary.
2) As noise and signal vaules in private structure already get
modified, we don't need to explicitly pass
"struct mwifiex_ds_get_signal" to get it filled.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f85aae6b

drivers/net/wireless/mwifiex/cfg80211.c

+7 −9
Original line number Diff line number Diff line
@@ -516,9 +516,7 @@ static int 
mwifiex_dump_station_info(struct mwifiex_private *priv,

			  struct station_info *sinfo)

{

	struct mwifiex_ds_get_signal signal;

	struct mwifiex_rate_cfg rate;

	int ret = 0;



	sinfo->filled = STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES |

		STATION_INFO_RX_PACKETS |
@@ -526,15 +524,15 @@ mwifiex_dump_station_info(struct mwifiex_private *priv, 
		| STATION_INFO_SIGNAL | STATION_INFO_TX_BITRATE;



	/* Get signal information from the firmware */

	memset(&signal, 0, sizeof(struct mwifiex_ds_get_signal));

	if (mwifiex_get_signal_info(priv, &signal)) {

		dev_err(priv->adapter->dev, "getting signal information\n");

		ret = -EFAULT;

	if (mwifiex_send_cmd_sync(priv, HostCmd_CMD_RSSI_INFO,

				  HostCmd_ACT_GEN_GET, 0, NULL)) {

		dev_err(priv->adapter->dev, "failed to get signal information\n");

		return -EFAULT;

	}



	if (mwifiex_drv_get_data_rate(priv, &rate)) {

		dev_err(priv->adapter->dev, "getting data rate\n");

		ret = -EFAULT;

		return -EFAULT;

	}



	/* Get DTIM period information from firmware */
@@ -561,7 +559,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv, 
	sinfo->tx_bytes = priv->stats.tx_bytes;

	sinfo->rx_packets = priv->stats.rx_packets;

	sinfo->tx_packets = priv->stats.tx_packets;

	sinfo->signal = priv->qual_level;

	sinfo->signal = priv->bcn_rssi_avg;

	/* bit rate is in 500 kb/s units. Convert it to 100kb/s units */

	sinfo->txrate.legacy = rate.rate * 5;
@@ -581,7 +579,7 @@ mwifiex_dump_station_info(struct mwifiex_private *priv, 
			priv->curr_bss_params.bss_descriptor.beacon_period;

	}



	return ret;

	return 0;

}



/*

drivers/net/wireless/mwifiex/ioctl.h

+0 −28
Original line number Diff line number Diff line
@@ -85,34 +85,6 @@ struct mwifiex_ds_get_stats { 
	u32 wep_icv_error[4];

};



#define BCN_RSSI_AVG_MASK               0x00000002

#define BCN_NF_AVG_MASK                 0x00000200

#define ALL_RSSI_INFO_MASK              0x00000fff



struct mwifiex_ds_get_signal {

	/*

	 * Bit0:  Last Beacon RSSI,  Bit1:  Average Beacon RSSI,

	 * Bit2:  Last Data RSSI,    Bit3:  Average Data RSSI,

	 * Bit4:  Last Beacon SNR,   Bit5:  Average Beacon SNR,

	 * Bit6:  Last Data SNR,     Bit7:  Average Data SNR,

	 * Bit8:  Last Beacon NF,    Bit9:  Average Beacon NF,

	 * Bit10: Last Data NF,      Bit11: Average Data NF

	 */

	u16 selector;

	s16 bcn_rssi_last;

	s16 bcn_rssi_avg;

	s16 data_rssi_last;

	s16 data_rssi_avg;

	s16 bcn_snr_last;

	s16 bcn_snr_avg;

	s16 data_snr_last;

	s16 data_snr_avg;

	s16 bcn_nf_last;

	s16 bcn_nf_avg;

	s16 data_nf_last;

	s16 data_nf_avg;

};



#define MWIFIEX_MAX_VER_STR_LEN    128



struct mwifiex_ver_ext {

drivers/net/wireless/mwifiex/main.h

+0 −3
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ struct mwifiex_private { 
	struct dentry *dfs_dev_dir;

#endif

	u8 nick_name[16];

	u8 qual_level, qual_noise;

	u16 current_key_index;

	struct semaphore async_sem;

	u8 scan_pending_on_block;
@@ -896,8 +895,6 @@ int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss, 
int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type);

int mwifiex_enable_hs(struct mwifiex_adapter *adapter);

int mwifiex_disable_auto_ds(struct mwifiex_private *priv);

int mwifiex_get_signal_info(struct mwifiex_private *priv,

			    struct mwifiex_ds_get_signal *signal);

int mwifiex_drv_get_data_rate(struct mwifiex_private *priv,

			      struct mwifiex_rate_cfg *rate);

int mwifiex_request_scan(struct mwifiex_private *priv,

drivers/net/wireless/mwifiex/sta_cmdresp.c

+2 −32
Original line number Diff line number Diff line
@@ -119,8 +119,7 @@ mwifiex_process_cmdresp_error(struct mwifiex_private *priv, 
 * calculated SNR values.

 */

static int mwifiex_ret_802_11_rssi_info(struct mwifiex_private *priv,

					struct host_cmd_ds_command *resp,

					struct mwifiex_ds_get_signal *signal)

					struct host_cmd_ds_command *resp)

{

	struct host_cmd_ds_802_11_rssi_info_rsp *rssi_info_rsp =

						&resp->params.rssi_info_rsp;
@@ -137,35 +136,6 @@ static int mwifiex_ret_802_11_rssi_info(struct mwifiex_private *priv, 
	priv->bcn_rssi_avg = le16_to_cpu(rssi_info_rsp->bcn_rssi_avg);

	priv->bcn_nf_avg = le16_to_cpu(rssi_info_rsp->bcn_nf_avg);



	/* Need to indicate IOCTL complete */

	if (signal) {

		memset(signal, 0, sizeof(*signal));



		signal->selector = ALL_RSSI_INFO_MASK;



		/* RSSI */

		signal->bcn_rssi_last = priv->bcn_rssi_last;

		signal->bcn_rssi_avg = priv->bcn_rssi_avg;

		signal->data_rssi_last = priv->data_rssi_last;

		signal->data_rssi_avg = priv->data_rssi_avg;



		/* SNR */

		signal->bcn_snr_last =

			CAL_SNR(priv->bcn_rssi_last, priv->bcn_nf_last);

		signal->bcn_snr_avg =

			CAL_SNR(priv->bcn_rssi_avg, priv->bcn_nf_avg);

		signal->data_snr_last =

			CAL_SNR(priv->data_rssi_last, priv->data_nf_last);

		signal->data_snr_avg =

			CAL_SNR(priv->data_rssi_avg, priv->data_nf_avg);



		/* NF */

		signal->bcn_nf_last = priv->bcn_nf_last;

		signal->bcn_nf_avg = priv->bcn_nf_avg;

		signal->data_nf_last = priv->data_nf_last;

		signal->data_nf_avg = priv->data_nf_avg;

	}



	return 0;

}
@@ -853,7 +823,7 @@ int mwifiex_process_sta_cmdresp(struct mwifiex_private *priv, u16 cmdresp_no, 
		ret = mwifiex_ret_get_log(priv, resp, data_buf);

		break;

	case HostCmd_CMD_RSSI_INFO:

		ret = mwifiex_ret_802_11_rssi_info(priv, resp, data_buf);

		ret = mwifiex_ret_802_11_rssi_info(priv, resp);

		break;

	case HostCmd_CMD_802_11_SNMP_MIB:

		ret = mwifiex_ret_802_11_snmp_mib(priv, resp, data_buf);

drivers/net/wireless/mwifiex/sta_event.c

+0 −3
Original line number Diff line number Diff line
@@ -128,9 +128,6 @@ mwifiex_reset_connect_state(struct mwifiex_private *priv) 
		mwifiex_stop_net_dev_queue(priv->netdev, adapter);

	if (netif_carrier_ok(priv->netdev))

		netif_carrier_off(priv->netdev);

	/* Reset wireless stats signal info */

	priv->qual_level = 0;

	priv->qual_noise = 0;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE