leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mwifiex: remove unreachable code

Browse Source 
In disconnected state "iw dev mlan0 link" command will return
from cfg80211 stack itself. We also have an error check in
mwifiex_cfg80211_get_station() routine. Therefore the code
under "if (!priv->media_connected)" condition in
mwifiex_rate_ioctl_get_rate_value() routine becomes unreachable.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Amitkumar Karwar 2011-09-26 20:37:24 -07:00 committed by John W. Linville
parent 82df4d38a0
commit cbaaf592b7
1 changed files with 2 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/net/wireless/mwifiex/sta_ioctl.c
View File

@ -720,51 +720,9 @@ done:
static int mwifiex_rate_ioctl_get_rate_value(struct mwifiex_private *priv, static int mwifiex_rate_ioctl_get_rate_value(struct mwifiex_private *priv,
struct mwifiex_rate_cfg *rate_cfg) struct mwifiex_rate_cfg *rate_cfg)
{ {
struct mwifiex_adapter *adapter = priv->adapter;
rate_cfg->is_rate_auto = priv->is_data_rate_auto; rate_cfg->is_rate_auto = priv->is_data_rate_auto;
if (!priv->media_connected) { return mwifiex_send_cmd_sync(priv, HostCmd_CMD_802_11_TX_RATE_QUERY,
switch (adapter->config_bands) { HostCmd_ACT_GEN_GET, 0, NULL);
case BAND_B:
/* Return the lowest supported rate for B band */
rate_cfg->rate = supported_rates_b[0] & 0x7f;
break;
case BAND_G:
case BAND_G | BAND_GN:
/* Return the lowest supported rate for G band */
rate_cfg->rate = supported_rates_g[0] & 0x7f;
break;
case BAND_B | BAND_G:
case BAND_A | BAND_B | BAND_G:
case BAND_A | BAND_B:
case BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN:
case BAND_B | BAND_G | BAND_GN:
/* Return the lowest supported rate for BG band */
rate_cfg->rate = supported_rates_bg[0] & 0x7f;
break;
case BAND_A:
case BAND_A | BAND_G:
case BAND_A | BAND_G | BAND_AN | BAND_GN:
case BAND_A | BAND_AN:
/* Return the lowest supported rate for A band */
rate_cfg->rate = supported_rates_a[0] & 0x7f;
break;
case BAND_GN:
/* Return the lowest supported rate for N band */
rate_cfg->rate = supported_rates_n[0] & 0x7f;
break;
default:
dev_warn(adapter->dev, "invalid band %#x\n",
adapter->config_bands);
break;
}
} else {
return mwifiex_send_cmd_sync(priv,
HostCmd_CMD_802_11_TX_RATE_QUERY,
HostCmd_ACT_GEN_GET, 0, NULL);
}
return 0;
} }
/* /*