mwifiex: remove MWIFIEX_BSS_MODE_ macros
replace them with NL80211_IFTYPE_ macros
Also remove redundant functions mwifiex_drv_get_mode()
and mwifiex_bss_ioctl_mode().
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 1152beb..69ea32f 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -455,8 +455,8 @@
bss_desc->disable_11n = false;
/* Don't check for compatibility if roaming */
- if (priv->media_connected && (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA)
- && (bss_desc->bss_mode == MWIFIEX_BSS_MODE_INFRA))
+ if (priv->media_connected && (priv->bss_mode == NL80211_IFTYPE_STATION)
+ && (bss_desc->bss_mode == NL80211_IFTYPE_STATION))
return index;
if (priv->wps.session_enable) {
@@ -573,8 +573,8 @@
for (i = 0; i < adapter->num_in_scan_table; i++) {
switch (mode) {
- case MWIFIEX_BSS_MODE_INFRA:
- case MWIFIEX_BSS_MODE_IBSS:
+ case NL80211_IFTYPE_STATION:
+ case NL80211_IFTYPE_ADHOC:
if (mwifiex_is_network_compatible(priv, i, mode) >= 0) {
if (SCAN_RSSI(adapter->scan_table[i].rssi) >
best_rssi) {
@@ -584,7 +584,7 @@
}
}
break;
- case MWIFIEX_BSS_MODE_AUTO:
+ case NL80211_IFTYPE_UNSPECIFIED:
default:
if (SCAN_RSSI(adapter->scan_table[i].rssi) >
best_rssi) {
@@ -1314,9 +1314,9 @@
}
if (bss_entry->cap_info_bitmap & WLAN_CAPABILITY_IBSS)
- bss_entry->bss_mode = MWIFIEX_BSS_MODE_IBSS;
+ bss_entry->bss_mode = NL80211_IFTYPE_ADHOC;
else
- bss_entry->bss_mode = MWIFIEX_BSS_MODE_INFRA;
+ bss_entry->bss_mode = NL80211_IFTYPE_STATION;
/* Process variable IE */
@@ -2251,8 +2251,7 @@
searching the table for multiple entires for the SSID until no
more are found */
while ((table_idx = mwifiex_find_ssid_in_list(priv, del_ssid, NULL,
- MWIFIEX_BSS_MODE_AUTO)) >=
- 0) {
+ NL80211_IFTYPE_UNSPECIFIED)) >= 0) {
dev_dbg(priv->adapter->dev,
"info: Scan: Delete SSID Entry: Found Idx = %d\n",
table_idx);
@@ -2746,8 +2745,8 @@
(priv, (u8) adapter->scan_table[i].bss_band,
(u16) adapter->scan_table[i].channel))) {
switch (mode) {
- case MWIFIEX_BSS_MODE_INFRA:
- case MWIFIEX_BSS_MODE_IBSS:
+ case NL80211_IFTYPE_STATION:
+ case NL80211_IFTYPE_ADHOC:
j = mwifiex_is_network_compatible(priv, i,
mode);
@@ -2765,7 +2764,7 @@
net = j;
}
break;
- case MWIFIEX_BSS_MODE_AUTO:
+ case NL80211_IFTYPE_UNSPECIFIED:
default:
/*
* Do not check compatibility if the mode
@@ -2829,8 +2828,8 @@
scan_table[i].
channel)) {
switch (mode) {
- case MWIFIEX_BSS_MODE_INFRA:
- case MWIFIEX_BSS_MODE_IBSS:
+ case NL80211_IFTYPE_STATION:
+ case NL80211_IFTYPE_ADHOC:
net = mwifiex_is_network_compatible(priv, i,
mode);
break;
@@ -2881,7 +2880,7 @@
(u8 *) &req_bss->mac_address, ETH_ALEN);
/* Make sure we are in the right mode */
- if (priv->bss_mode == MWIFIEX_BSS_MODE_AUTO)
+ if (priv->bss_mode == NL80211_IFTYPE_UNSPECIFIED)
priv->bss_mode = req_bss->bss_mode;
}