From 21d1650021d23081a2b9148c2da051a4915191f1 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 15 Feb 2013 11:47:50 +0100 Subject: [PATCH] --- yaml --- r: 352816 b: refs/heads/master c: 572078be54856bf751af9a43d501ffb8d09b1ea7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/iface.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7f5ae6abd3ef..1da41ab1c13e 100644 --- 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 index a1f7194295fe..2c059e54e885 100644 --- 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)