diff --git a/[refs] b/[refs] index f2daf8bed836..0cd93261d461 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 135792ec246ddd0b2738dd95447297ea0b91943b +refs/heads/master: c62094889f7bb0b3343d5404c9d139d2fb1712bb diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c index cb73a0341af4..5715e7b3affc 100644 --- a/trunk/net/mac80211/util.c +++ b/trunk/net/mac80211/util.c @@ -1415,10 +1415,10 @@ int ieee80211_reconfig(struct ieee80211_local *local) if (ieee80211_sdata_running(sdata)) ieee80211_enable_keys(sdata); + wake_up: local->in_reconfig = false; barrier(); - wake_up: /* * Clear the WLAN_STA_BLOCK_BA flag so new aggregation * sessions can be established after a resume.