diff --git a/[refs] b/[refs]
index c61ba56205d6..230195315b8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfff2f999d9baa561f20d999c8b83b03f078fb8f
+refs/heads/master: 20f544eea03db4b498942558b882d463ce575c3e
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index e6e4bda0528e..fa1d343faa4b 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1491,6 +1491,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 		list_for_each_entry(sdata, &local->interfaces, list) {
 			if (sdata->vif.type != NL80211_IFTYPE_STATION)
 				continue;
+			if (!sdata->u.mgd.associated)
+				continue;
 
 			ieee80211_send_nullfunc(local, sdata, 0);
 		}