summaryrefslogtreecommitdiffstats
path: root/net/mac80211/offchannel.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-06-05 14:28:40 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-06-06 15:20:33 -0400
commit196ac1c13d4db6c276dbb1c9190c8d7d45a83f1f (patch)
tree68d2a1b99ec08d685381c812e38d0f18553e1cee /net/mac80211/offchannel.c
parent491b26b40222cc769c163e77177697dd7a63c316 (diff)
downloadlinux-196ac1c13d4db6c276dbb1c9190c8d7d45a83f1f.tar.bz2
mac80211: do remain-on-channel while idle
The IDLE handling in HW off-channel is broken right now since we turn off IDLE only when the off-channel period already started. Therefore, all drivers that use it today (only iwlwifi!) must support off-channel while idle, so playing with idle isn't needed at all. Off-channel in general, since it's no longer used for authentication/association, shouldn't affect PS, so also remove that logic. Also document a small caveat for reporting TX status from off-channel frames in HW remain-on-channel. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/offchannel.c')
-rw-r--r--net/mac80211/offchannel.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 935aa4b6deee..8f482b15bc51 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -207,8 +207,6 @@ static void ieee80211_hw_roc_start(struct work_struct *work)
GFP_KERNEL);
}
- ieee80211_recalc_idle(local);
-
mutex_unlock(&local->mtx);
}
@@ -260,8 +258,6 @@ static void ieee80211_hw_roc_done(struct work_struct *work)
local->hw_roc_channel = NULL;
local->hw_roc_cookie = 0;
- ieee80211_recalc_idle(local);
-
mutex_unlock(&local->mtx);
}