diff options
| author | Amitkumar Karwar | 2013-01-03 01:56:00 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-01-07 21:16:59 +0100 |
| commit | d35f1035b53e92167a8231e15121dd10f4aa8edd (patch) | |
| tree | f786fc530a2e067267dddd8a49f070e67da21c77 /drivers/net/wireless/mwifiex/11n.c | |
| parent | wireless: mwifiex: remove unreachable paths (diff) | |
| download | kernel-qcow2-linux-d35f1035b53e92167a8231e15121dd10f4aa8edd.tar.gz kernel-qcow2-linux-d35f1035b53e92167a8231e15121dd10f4aa8edd.tar.xz kernel-qcow2-linux-d35f1035b53e92167a8231e15121dd10f4aa8edd.zip | |
mwifiex: use correct htcapinfo for HT20 ibss network
It is observed that same htcapinfo ie is included in beacon for
HT20, HT40+ and HT40- ibss networks. This patch makes sure that
we will not advertise 40Mhz flags while creating/joining ibss
network in HT20 mode.
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/11n.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/11n.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c index 245a371f1a43..9cd6216c61e6 100644 --- a/drivers/net/wireless/mwifiex/11n.c +++ b/drivers/net/wireless/mwifiex/11n.c @@ -53,7 +53,9 @@ mwifiex_fill_cap_info(struct mwifiex_private *priv, u8 radio_type, sizeof(sband->ht_cap.mcs)); if (priv->bss_mode == NL80211_IFTYPE_STATION || - sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40) + (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 && + (priv->adapter->sec_chan_offset != + IEEE80211_HT_PARAM_CHA_SEC_NONE))) /* Set MCS32 for infra mode or ad-hoc mode with 40MHz support */ SETHT_MCS32(ht_cap->ht_cap.mcs.rx_mask); |