aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/scan.c
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2011-07-13 21:38:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-08 14:26:28 -0400
commit67a50035b3f9335b9e5800c32149173e797b9cc0 (patch)
tree2a01afd36d82e27e51955eb1b188c2e34a1baca6 /drivers/net/wireless/mwifiex/scan.c
parent7c966a6de5be35737038cd71be7a3e36470aa52f (diff)
mwifiex: remove wireless.h inclusion and fix resulting bugs
replace IW_MAX_AP & IW_CUSTOM_MAX with local definitions and remove usage of struct iw_statistics. Cc: Johannes Berg <johannes.berg@intel.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/scan.c')
-rw-r--r--drivers/net/wireless/mwifiex/scan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 6f88c8ab5de5..1fdfd41c3100 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -2308,7 +2308,7 @@ int mwifiex_scan_networks(struct mwifiex_private *priv,
2308 2308
2309 if (!keep_previous_scan) { 2309 if (!keep_previous_scan) {
2310 memset(adapter->scan_table, 0x00, 2310 memset(adapter->scan_table, 0x00,
2311 sizeof(struct mwifiex_bssdescriptor) * IW_MAX_AP); 2311 sizeof(struct mwifiex_bssdescriptor) * MWIFIEX_MAX_AP);
2312 adapter->num_in_scan_table = 0; 2312 adapter->num_in_scan_table = 0;
2313 adapter->bcn_buf_end = adapter->bcn_buf; 2313 adapter->bcn_buf_end = adapter->bcn_buf;
2314 } 2314 }
@@ -2430,7 +2430,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
2430 scan_rsp = &resp->params.scan_resp; 2430 scan_rsp = &resp->params.scan_resp;
2431 2431
2432 2432
2433 if (scan_rsp->number_of_sets > IW_MAX_AP) { 2433 if (scan_rsp->number_of_sets > MWIFIEX_MAX_AP) {
2434 dev_err(adapter->dev, "SCAN_RESP: too many AP returned (%d)\n", 2434 dev_err(adapter->dev, "SCAN_RESP: too many AP returned (%d)\n",
2435 scan_rsp->number_of_sets); 2435 scan_rsp->number_of_sets);
2436 ret = -1; 2436 ret = -1;
@@ -2542,7 +2542,7 @@ int mwifiex_ret_802_11_scan(struct mwifiex_private *priv,
2542 if (bss_idx == num_in_table) { 2542 if (bss_idx == num_in_table) {
2543 /* Range check the bss_idx, keep it limited to 2543 /* Range check the bss_idx, keep it limited to
2544 the last entry */ 2544 the last entry */
2545 if (bss_idx == IW_MAX_AP) 2545 if (bss_idx == MWIFIEX_MAX_AP)
2546 bss_idx--; 2546 bss_idx--;
2547 else 2547 else
2548 num_in_table++; 2548 num_in_table++;