[PATCH] mac80211: always clear SDATA_STATE_OFFCHANNEL flag
From: Eliad Peller <hidden>
Date: 2011-12-22 23:46:55
Subsystem:
mac80211, the rest · Maintainers:
Johannes Berg, Linus Torvalds
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 <redacted> --- net/mac80211/offchannel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index e4330d8..2948f8e 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
--
1.7.6.401.g6a319