From 4ca83aaf2d96706b1a25bc2e0efe75ba2400525a Mon Sep 17 00:00:00 2001
From: Amitkumar Karwar <akarwar@marvell.com>
Date: Wed, 2 Jan 2013 16:56:00 -0800
Subject: [PATCH] --- yaml --- r: 351823 b: refs/heads/master c:
 d35f1035b53e92167a8231e15121dd10f4aa8edd h: refs/heads/master i:   351821:
 88d80bb0a376715621418ceb39f73d1b1eb64d42   351819:
 30b1a07cfdb7984f60f4907420b93173e20c56d9   351815:
 dc382f43ddeb0aa436b3b3b2888ca7a10e33189a   351807:
 6c6f5a9de6756aafeb3a8b17f2cf83d68537aa2a v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/net/wireless/mwifiex/11n.c  |  4 +++-
 trunk/drivers/net/wireless/mwifiex/join.c | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d4d582875578..b0237a3bfad3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc40ca92344a4e4a45bf916cf067e92085b881ea
+refs/heads/master: d35f1035b53e92167a8231e15121dd10f4aa8edd
diff --git a/trunk/drivers/net/wireless/mwifiex/11n.c b/trunk/drivers/net/wireless/mwifiex/11n.c
index 245a371f1a43..9cd6216c61e6 100644
--- a/trunk/drivers/net/wireless/mwifiex/11n.c
+++ b/trunk/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);
 
diff --git a/trunk/drivers/net/wireless/mwifiex/join.c b/trunk/drivers/net/wireless/mwifiex/join.c
index 88664ae667ba..3c7cabeddf76 100644
--- a/trunk/drivers/net/wireless/mwifiex/join.c
+++ b/trunk/drivers/net/wireless/mwifiex/join.c
@@ -969,6 +969,16 @@ mwifiex_cmd_802_11_ad_hoc_start(struct mwifiex_private *priv,
 					priv->adapter->config_bands);
 		mwifiex_fill_cap_info(priv, radio_type, ht_cap);
 
+		if (adapter->sec_chan_offset ==
+					IEEE80211_HT_PARAM_CHA_SEC_NONE) {
+			u16 tmp_ht_cap;
+
+			tmp_ht_cap = le16_to_cpu(ht_cap->ht_cap.cap_info);
+			tmp_ht_cap &= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+			tmp_ht_cap &= ~IEEE80211_HT_CAP_SGI_40;
+			ht_cap->ht_cap.cap_info = cpu_to_le16(tmp_ht_cap);
+		}
+
 		pos += sizeof(struct mwifiex_ie_types_htcap);
 		cmd_append_size += sizeof(struct mwifiex_ie_types_htcap);