summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorEliad Peller <eliad@wizery.com>2011-12-23 01:48:06 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-01-04 14:30:43 -0500
commitf6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9 (patch)
tree83ebc7844b19211de72a89e54596bc656816dace /net
parentb156579b1404871d97d2713c1f93c9526618e3ba (diff)
downloadlinux-3.10-f6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9.tar.gz
linux-3.10-f6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9.tar.bz2
linux-3.10-f6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9.zip
mac80211: always clear SDATA_STATE_OFFCHANNEL flag
If the vif is stopped while it is offchannel (e.g. right after p2p negotiation) the SDATA_STATE_OFFCHANNEL flag is never get cleared, resulting in various bad effects (e.g. GO can't start beaconing). Fix it by clearing the SDATA_STATE_OFFCHANNEL flag even if the vif is stopped. Signed-off-by: Eliad Peller <eliad@wizery.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/offchannel.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index e4330d84357..2948f8e2e67 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -162,6 +162,9 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
mutex_lock(&local->iflist_mtx);
list_for_each_entry(sdata, &local->interfaces, list) {
+ if (sdata->vif.type != NL80211_IFTYPE_MONITOR)
+ clear_bit(SDATA_STATE_OFFCHANNEL, &sdata->state);
+
if (!ieee80211_sdata_running(sdata))
continue;
@@ -173,7 +176,6 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
}
if (sdata->vif.type != NL80211_IFTYPE_MONITOR) {
- clear_bit(SDATA_STATE_OFFCHANNEL, &sdata->state);
/*
* This may wake up queues even though the driver
* currently has them stopped. This is not very