Commit c4859fbc authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville

mwifiex: remove redundant local structures

Avoid use of local structure in the function if the structure is
already allocated by the caller and the structure pointer is passed.
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 0fd82eaf
...@@ -1250,11 +1250,9 @@ mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter, char *version, ...@@ -1250,11 +1250,9 @@ mwifiex_drv_get_driver_version(struct mwifiex_adapter *adapter, char *version,
int mwifiex_get_signal_info(struct mwifiex_private *priv, int mwifiex_get_signal_info(struct mwifiex_private *priv,
struct mwifiex_ds_get_signal *signal) struct mwifiex_ds_get_signal *signal)
{ {
struct mwifiex_ds_get_signal info;
int status; int status;
memset(&info, 0, sizeof(struct mwifiex_ds_get_signal)); signal->selector = ALL_RSSI_INFO_MASK;
info.selector = ALL_RSSI_INFO_MASK;
/* Signal info can be obtained only if connected */ /* Signal info can be obtained only if connected */
if (!priv->media_connected) { if (!priv->media_connected) {
...@@ -1267,13 +1265,10 @@ int mwifiex_get_signal_info(struct mwifiex_private *priv, ...@@ -1267,13 +1265,10 @@ int mwifiex_get_signal_info(struct mwifiex_private *priv,
HostCmd_ACT_GEN_GET, 0, signal); HostCmd_ACT_GEN_GET, 0, signal);
if (!status) { if (!status) {
if (signal) if (signal->selector & BCN_RSSI_AVG_MASK)
memcpy(signal, &info, priv->w_stats.qual.level = signal->bcn_rssi_avg;
sizeof(struct mwifiex_ds_get_signal)); if (signal->selector & BCN_NF_AVG_MASK)
if (info.selector & BCN_RSSI_AVG_MASK) priv->w_stats.qual.noise = signal->bcn_nf_avg;
priv->w_stats.qual.level = info.bcn_rssi_avg;
if (info.selector & BCN_NF_AVG_MASK)
priv->w_stats.qual.noise = info.bcn_nf_avg;
} }
return status; return status;
...@@ -1333,19 +1328,14 @@ mwifiex_get_stats_info(struct mwifiex_private *priv, ...@@ -1333,19 +1328,14 @@ mwifiex_get_stats_info(struct mwifiex_private *priv,
struct mwifiex_ds_get_stats *log) struct mwifiex_ds_get_stats *log)
{ {
int ret; int ret;
struct mwifiex_ds_get_stats get_log;
memset(&get_log, 0, sizeof(struct mwifiex_ds_get_stats));
ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_GET_LOG, ret = mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_GET_LOG,
HostCmd_ACT_GEN_GET, 0, &get_log); HostCmd_ACT_GEN_GET, 0, log);
if (!ret) { if (!ret) {
if (log) priv->w_stats.discard.fragment = log->fcs_error;
memcpy(log, &get_log, sizeof(struct priv->w_stats.discard.retries = log->retry;
mwifiex_ds_get_stats)); priv->w_stats.discard.misc = log->ack_failure;
priv->w_stats.discard.fragment = get_log.fcs_error;
priv->w_stats.discard.retries = get_log.retry;
priv->w_stats.discard.misc = get_log.ack_failure;
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment