aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/scan.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2011-04-27 22:13:12 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-28 14:53:23 -0400
commita46b7b5c13b9ecfe2b4e045e06aaec644dcf55d8 (patch)
treed74c4482678c0221d1b006cee48a56e8d962a557 /drivers/net/wireless/mwifiex/scan.c
parentadc89595732b92f78940fc0ccdb52afaec582a48 (diff)
mwifiex: HT capability information handling
1) Initialise HT capabilities in cfg80211 properly. 2) Cfg80211 stack may modify "sband->ht_cap" to disable 40Mhz operation in 2.4GHz band (after recent patch "cfg80211: module_param to disable HT40 in 2.4GHz band") Therefore read "sband->ht_cap" instead of an adapter variable "hw_dot_11n_dev_cap" to get HT capabilities. 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/scan.c')
-rw-r--r--drivers/net/wireless/mwifiex/scan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c
index 68d905d58606..be708ad8c44d 100644
--- a/drivers/net/wireless/mwifiex/scan.c
+++ b/drivers/net/wireless/mwifiex/scan.c
@@ -1007,7 +1007,9 @@ mwifiex_scan_setup_scan_config(struct mwifiex_private *priv,
1007 ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY); 1007 ht_cap->header.type = cpu_to_le16(WLAN_EID_HT_CAPABILITY);
1008 ht_cap->header.len = 1008 ht_cap->header.len =
1009 cpu_to_le16(sizeof(struct ieee80211_ht_cap)); 1009 cpu_to_le16(sizeof(struct ieee80211_ht_cap));
1010 mwifiex_fill_cap_info(priv, ht_cap); 1010 radio_type =
1011 mwifiex_band_to_radio_type(priv->adapter->config_bands);
1012 mwifiex_fill_cap_info(priv, radio_type, ht_cap);
1011 tlv_pos += sizeof(struct mwifiex_ie_types_htcap); 1013 tlv_pos += sizeof(struct mwifiex_ie_types_htcap);
1012 } 1014 }
1013 1015