summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/mwifiex/cfg80211.c
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2011-05-11 07:47:36 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-05-11 22:50:43 +0400
commita8c485652ad4217800015aab25f1b70b96adb1a9 (patch)
tree184615fb1d6ae579c629fa56e9f0cbe61006a693 /drivers/net/wireless/mwifiex/cfg80211.c
parentc4859fbcfc12d5cfe8c30a33ad37d192a3093a7b (diff)
downloadlinux-a8c485652ad4217800015aab25f1b70b96adb1a9.tar.xz
mwifiex: cleanup ioctl.h
Some structures and macros in ioctl.h are redundant or no longer used. Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
-rw-r--r--drivers/net/wireless/mwifiex/cfg80211.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index 19be8870c683..660831ce293c 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -761,7 +761,6 @@ static int mwifiex_cfg80211_inform_ibss_bss(struct mwifiex_private *priv)
static int mwifiex_inform_bss_from_scan_result(struct mwifiex_private *priv,
struct mwifiex_802_11_ssid *ssid)
{
- struct mwifiex_scan_resp scan_resp;
struct mwifiex_bssdescriptor *scan_table;
int i, j;
struct ieee80211_channel *chan;
@@ -771,10 +770,6 @@ static int mwifiex_inform_bss_from_scan_result(struct mwifiex_private *priv,
int beacon_size;
u8 element_id, element_len;
- memset(&scan_resp, 0, sizeof(scan_resp));
- scan_resp.scan_table = (u8 *) priv->adapter->scan_table;
- scan_resp.num_in_scan_table = priv->adapter->num_in_scan_table;
-
#define MAX_IE_BUF 2048
ie_buf = kzalloc(MAX_IE_BUF, GFP_KERNEL);
if (!ie_buf) {
@@ -783,8 +778,8 @@ static int mwifiex_inform_bss_from_scan_result(struct mwifiex_private *priv,
return -ENOMEM;
}
- scan_table = (struct mwifiex_bssdescriptor *) scan_resp.scan_table;
- for (i = 0; i < scan_resp.num_in_scan_table; i++) {
+ scan_table = priv->adapter->scan_table;
+ for (i = 0; i < priv->adapter->num_in_scan_table; i++) {
if (ssid) {
/* Inform specific BSS only */
if (memcmp(ssid->ssid, scan_table[i].ssid.ssid,