From 4acd9b756d3702c4188eaf8e46b5e62a8f444caa Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Fri, 23 Dec 2011 01:48:06 +0200 Subject: [PATCH] --- yaml --- r: 279448 b: refs/heads/master c: f6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/offchannel.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1be32cafebb5..8560fc428529 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b156579b1404871d97d2713c1f93c9526618e3ba +refs/heads/master: f6e8cb72ad4b0381d79df4575ec1f5c5df2e73b9 diff --git a/trunk/net/mac80211/offchannel.c b/trunk/net/mac80211/offchannel.c index e4330d843575..2948f8e2e675 100644 --- a/trunk/net/mac80211/offchannel.c +++ b/trunk/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