diff --git a/[refs] b/[refs]
index 80b8bdb2dac3..db7360dad6d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cfd43f484c8d4bcb38db83f7be19fbd4ac8440c
+refs/heads/master: 90b726097ba0dcc1f9725182513e669a30e77db5
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index 5706156d1ecf..88b671a16a41 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -359,6 +359,9 @@ static int ieee80211_ifa_changed(struct notifier_block *nb,
 	struct ieee80211_sub_if_data *sdata;
 	struct ieee80211_if_managed *ifmgd;
 
+	if (!netif_running(ndev))
+		return NOTIFY_DONE;
+
 	/* Make sure it's our interface that got changed */
 	if (!wdev)
 		return NOTIFY_DONE;