aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/11n.c
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2011-03-28 20:55:41 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 16:20:04 -0400
commiteecd8250e492ffc4e7b72953cda9c2f3ba0e6ccc (patch)
tree1897ca77a7d7746bd6c2fd8f748e06bee971bdfb /drivers/net/wireless/mwifiex/11n.c
parent6a4c499e86f54ed9316a87e7ddc6b7d33adb4976 (diff)
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n.c')
-rw-r--r--drivers/net/wireless/mwifiex/11n.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c
index ce6421f3230b..73a6e62f5680 100644
--- a/drivers/net/wireless/mwifiex/11n.c
+++ b/drivers/net/wireless/mwifiex/11n.c
@@ -109,7 +109,7 @@ mwifiex_fill_cap_info(struct mwifiex_private *priv,
109 memset(&mcs[rx_mcs_supp], 0, 109 memset(&mcs[rx_mcs_supp], 0,
110 sizeof(struct ieee80211_mcs_info) - rx_mcs_supp); 110 sizeof(struct ieee80211_mcs_info) - rx_mcs_supp);
111 111
112 if (priv->bss_mode == MWIFIEX_BSS_MODE_INFRA || 112 if (priv->bss_mode == NL80211_IFTYPE_STATION ||
113 (ht_cap_info & IEEE80211_HT_CAP_SUP_WIDTH_20_40)) 113 (ht_cap_info & IEEE80211_HT_CAP_SUP_WIDTH_20_40))
114 /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */ 114 /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */
115 SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask); 115 SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask);
@@ -418,7 +418,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,
418 } 418 }
419 419
420 if (bss_desc->bcn_ht_info) { 420 if (bss_desc->bcn_ht_info) {
421 if (priv->bss_mode == MWIFIEX_BSS_MODE_IBSS) { 421 if (priv->bss_mode == NL80211_IFTYPE_ADHOC) {
422 ht_info = (struct mwifiex_ie_types_htinfo *) *buffer; 422 ht_info = (struct mwifiex_ie_types_htinfo *) *buffer;
423 memset(ht_info, 0, 423 memset(ht_info, 0,
424 sizeof(struct mwifiex_ie_types_htinfo)); 424 sizeof(struct mwifiex_ie_types_htinfo));