From df0e00383755db13ab6f769a16b2a1b8706769f8 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 1 Aug 2012 20:13:36 +0200 Subject: [PATCH] --- yaml --- r: 327644 b: refs/heads/master c: 19c3b8303d4686aa373c669ee833609b3fb403cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e80401d86e6c..2ea2218905a4 100644 --- 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 index c416a08d90f1..9d60b4993635 100644 --- 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;