diff options
author | Johannes Berg <johannes.berg@intel.com> | 2013-02-15 05:47:50 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 07:48:40 -0500 |
commit | 572078be54856bf751af9a43d501ffb8d09b1ea7 (patch) | |
tree | 8b76390d92edd1ac46ab9f828923d61481ad51a9 /net/mac80211/iface.c | |
parent | 6295ca184b6216ecde68f16f487a524734761adf (diff) |
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>
Diffstat (limited to 'net/mac80211/iface.c')
-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 a1f7194295fe..2c059e54e885 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, | |||
696 | 696 | ||
697 | ieee80211_roc_purge(sdata); | 697 | ieee80211_roc_purge(sdata); |
698 | 698 | ||
699 | if (sdata->vif.type == NL80211_IFTYPE_STATION) | ||
700 | ieee80211_mgd_stop(sdata); | ||
701 | |||
699 | /* | 702 | /* |
700 | * Remove all stations associated with this interface. | 703 | * Remove all stations associated with this interface. |
701 | * | 704 | * |
@@ -783,8 +786,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, | |||
783 | } | 786 | } |
784 | } | 787 | } |
785 | spin_unlock_irqrestore(&ps->bc_buf.lock, flags); | 788 | spin_unlock_irqrestore(&ps->bc_buf.lock, flags); |
786 | } else if (sdata->vif.type == NL80211_IFTYPE_STATION) { | ||
787 | ieee80211_mgd_stop(sdata); | ||
788 | } | 789 | } |
789 | 790 | ||
790 | if (going_down) | 791 | if (going_down) |