mac80211: Don't go off-channel in work_work unless needed.
PATCH v2 1/1 mac80211: Don't go off-channel in work_work unless needed.
From: Ben Greear <[email protected]>
If the work to be done is on the current active channel, then do not call the offchannel and return-to-channel logic.
---
v1 -> v2: Remove went_off_channel logic, and don't set
tmp_channel if we're not going offchannel.
:100644 100644 ae344d1... 8a2ff479.. M net/mac80211/work.c
net/mac80211/work.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
net/mac80211/work.c +11 -6
@@ -910,12 +910,17 @@ static void ieee80211_work_work(struct work_struct *work)* happen to be on the same channel as * the requested channel */ -ieee80211_offchannel_stop_beaconing (local); -ieee80211_offchannel_stop_station (local); - - local->tmp_channel = wk->chan; - local->tmp_channel_type = wk->chan_type; -ieee80211_hw_config (local,0 ); +WARN_ON (local->scan_channel !=NULL ); +if (wk->chan != local->oper_channel || + wk->chan_type != local->_oper_channel_type) { +/* Only change channels if we need to */ +ieee80211_offchannel_stop_beaconing (local); +ieee80211_offchannel_stop_station (local); + + local->tmp_channel = wk->chan; + local->tmp_channel_type = wk->chan_type; +ieee80211_hw_config (local,0 ); + } started = true; wk->timeout = jiffies; }
Signature · 1 line
1.7.2.2
Johannes Berg
maintainerQuoted 9 lines · On Wed, 2010-09-29 at 12:05 -0700, [email protected] wrote:
From: Ben Greear <[email protected]>
If the work to be done is on the current active channel, then do not call the offchannel and return-to-channel logic.
Signed-off-by Ben Greear <[email protected]>---
v1 -> v2: Removewent_off_channellogic, and don't set
tmp_channelif we're not going offchannel.
I briefly grepped through the source and am pretty sure this'll break a few things in mlme.c and even the work-on-same-channel logic in work.c...
johannes
Quoted 6 lines · Johannes Berg
Quoted 5 lines · On Wed, 2010-09-29 at 12:05 -0700, [email protected] wrote:
From: Ben Greear<[email protected]>
If the work to be done is on the current active channel, then do not call the offchannel and return-to-channel logic.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Ben Greear<[email protected]>---
v1 -> v2: Removewent_off_channellogic, and don't set
tmp_channelif we're not going offchannel.I briefly grepped through the source and am pretty sure this'll break a few things in
mlme.cand even the work-on-same-channel logic inwork.c...
Ok. I don't understand this code enough to make more progress here I think.
Thanks,
Ben
Quoted 2 lines
johannes
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com