diff --git a/[refs] b/[refs]
index 45ac472b717c..81cffa178f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91d01556f52255a31575be0cb1981c92a2a5028
+refs/heads/master: a7b545f7fe753ca3dc1b51ca57f90cd59d974e44
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index cf68700abffa..d036597aabbe 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1210,7 +1210,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		switch (sdata->vif.type) {
 		case NL80211_IFTYPE_STATION:
 			changed |= BSS_CHANGED_ASSOC;
+			mutex_lock(&sdata->u.mgd.mtx);
 			ieee80211_bss_info_change_notify(sdata, changed);
+			mutex_unlock(&sdata->u.mgd.mtx);
 			break;
 		case NL80211_IFTYPE_ADHOC:
 			changed |= BSS_CHANGED_IBSS;