From bdae4fa9cf74981d441c3d6f493a13a3879650be Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 22 Nov 2012 14:34:05 +0100
Subject: [PATCH] --- yaml --- r: 341597 b: refs/heads/master c:
 03ae834faac9831181ae471543d9f640b75c652b h: refs/heads/master i:   341595:
 306af8f65b43eba57a06f99cab38e0461a8aea4f v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 570f610614d5..b272ca4be66d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8243b72459be78240e5e07f987c625f8d976c14
+refs/heads/master: 03ae834faac9831181ae471543d9f640b75c652b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 42b2c3fc470c..6d49d6c4ffc1 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -3267,6 +3267,7 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata,
 		sdata->needed_rx_chains = min(chains, local->rx_chains);
 	} else {
 		sdata->needed_rx_chains = 1;
+		sdata->u.mgd.flags |= IEEE80211_STA_DISABLE_HT;
 	}
 
 	/* will change later if needed */