---

yaml --- r: 327644 b: refs/heads/master c: 19c3b83 h: refs/heads/master v: v3
git-mirror · Aug 1, 2012 · df0e003 · df0e003
1 parent cbfb0d9
commit df0e003
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e83e6541cee0a12bc445b0f4fad5214df5803087
+refs/heads/master: 19c3b8303d4686aa373c669ee833609b3fb403cc
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -3357,10 +3357,13 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 	}
 
 	/* prepare assoc data */
-
-	ifmgd->flags &= ~IEEE80211_STA_DISABLE_11N;
-	ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED;
-	ifmgd->flags &= ~IEEE80211_STA_DISABLE_VHT;
+
+	/*
+	 * keep only the 40 MHz disable bit set as it might have
+	 * been set during authentication already, all other bits
+	 * should be reset for a new connection
+	 */
+	ifmgd->flags &= IEEE80211_STA_DISABLE_40MHZ;
 
 	ifmgd->beacon_crc_valid = false;