---

yaml --- r: 352816 b: refs/heads/master c: 572078b h: refs/heads/master v: v3
git-mirror · Feb 18, 2013 · 21d1650 · 21d1650
1 parent 6fb3943
commit 21d1650
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6295ca184b6216ecde68f16f487a524734761adf
+refs/heads/master: 572078be54856bf751af9a43d501ffb8d09b1ea7
diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c
@@ -696,6 +696,9 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
 
 	ieee80211_roc_purge(sdata);
 
+	if (sdata->vif.type == NL80211_IFTYPE_STATION)
+		ieee80211_mgd_stop(sdata);
+
 	/*
 	 * Remove all stations associated with this interface.
 	 *
@@ -783,8 +786,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
 			}
 		}
 		spin_unlock_irqrestore(&ps->bc_buf.lock, flags);
-	} else if (sdata->vif.type == NL80211_IFTYPE_STATION) {
-		ieee80211_mgd_stop(sdata);
 	}
 
 	if (going_down)