diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 11:47:50 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 13:48:40 +0100 |
| commit | 572078be54856bf751af9a43d501ffb8d09b1ea7 (patch) | |
| tree | 8b76390d92edd1ac46ab9f828923d61481ad51a9 | |
| parent | 6295ca184b6216ecde68f16f487a524734761adf (diff) | |
| download | linux-3.10-572078be54856bf751af9a43d501ffb8d09b1ea7.tar.gz linux-3.10-572078be54856bf751af9a43d501ffb8d09b1ea7.tar.bz2 linux-3.10-572078be54856bf751af9a43d501ffb8d09b1ea7.zip | |
mac80211: fix harmless station flush warning
If an interface is set down while authenticating or
associating, there's a station entry that will be
removed by the flushing in do_stop() and that will
cause a warning. It's otherwise harmless, but avoid
the warning by calling ieee80211_mgd_stop() first.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/iface.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index a1f7194295f..2c059e54e88 100644 --- a/net/mac80211/iface.c +++ b/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) |