diff options
author | Bing Zhao <bzhao@marvell.com> | 2011-07-21 23:25:58 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-08 14:29:20 -0400 |
commit | 26aaa4a0e923326560286e567b9fbf8429d5ef2b (patch) | |
tree | c1977e7b9f87344922795496dda67a7b4df2f56c /drivers/net/wireless/mwifiex | |
parent | 8e92f2acac918d36ef4aa591f55ba0589edf634d (diff) |
mwifiex: remove redundant variable scan_table_idx
mwifiex_get_bss_info() routine updates variable 'info->scan_table_idx'
but it is never used.
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/ioctl.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/sta_ioctl.c | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/mwifiex/ioctl.h b/drivers/net/wireless/mwifiex/ioctl.h index bd9e074a1c8..e0b68e7c8ca 100644 --- a/drivers/net/wireless/mwifiex/ioctl.h +++ b/drivers/net/wireless/mwifiex/ioctl.h | |||
@@ -134,7 +134,6 @@ struct mwifiex_ver_ext { | |||
134 | struct mwifiex_bss_info { | 134 | struct mwifiex_bss_info { |
135 | u32 bss_mode; | 135 | u32 bss_mode; |
136 | struct mwifiex_802_11_ssid ssid; | 136 | struct mwifiex_802_11_ssid ssid; |
137 | u32 scan_table_idx; | ||
138 | u32 bss_chan; | 137 | u32 bss_chan; |
139 | u32 region_code; | 138 | u32 region_code; |
140 | u32 media_connected; | 139 | u32 media_connected; |
diff --git a/drivers/net/wireless/mwifiex/sta_ioctl.c b/drivers/net/wireless/mwifiex/sta_ioctl.c index 10ef9e9dfef..fd764b3c675 100644 --- a/drivers/net/wireless/mwifiex/sta_ioctl.c +++ b/drivers/net/wireless/mwifiex/sta_ioctl.c | |||
@@ -376,7 +376,6 @@ int mwifiex_get_bss_info(struct mwifiex_private *priv, | |||
376 | { | 376 | { |
377 | struct mwifiex_adapter *adapter = priv->adapter; | 377 | struct mwifiex_adapter *adapter = priv->adapter; |
378 | struct mwifiex_bssdescriptor *bss_desc; | 378 | struct mwifiex_bssdescriptor *bss_desc; |
379 | s32 tbl_idx; | ||
380 | 379 | ||
381 | if (!info) | 380 | if (!info) |
382 | return -1; | 381 | return -1; |
@@ -394,17 +393,6 @@ int mwifiex_get_bss_info(struct mwifiex_private *priv, | |||
394 | 393 | ||
395 | info->region_code = adapter->region_code; | 394 | info->region_code = adapter->region_code; |
396 | 395 | ||
397 | /* Scan table index if connected */ | ||
398 | info->scan_table_idx = 0; | ||
399 | if (priv->media_connected) { | ||
400 | tbl_idx = | ||
401 | mwifiex_find_ssid_in_list(priv, &bss_desc->ssid, | ||
402 | bss_desc->mac_address, | ||
403 | priv->bss_mode); | ||
404 | if (tbl_idx >= 0) | ||
405 | info->scan_table_idx = tbl_idx; | ||
406 | } | ||
407 | |||
408 | info->media_connected = priv->media_connected; | 396 | info->media_connected = priv->media_connected; |
409 | 397 | ||
410 | info->max_power_level = priv->max_tx_power_level; | 398 | info->max_power_level = priv->max_tx_power_level; |