lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac80211: track work started through callbacks

Browse Source 
Currently, the remain_on_channel work callback needs
to track in its own data structure whether the work
was just started or not. By reordering some code this
becomes unnecessary, the generic wk->started variable
can still be 'false' on the first invocation and only
be 'true' on actual timeout invocations, so that the
extra variable can be removed.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg
2010-01-25 13:36:36 +01:00
committed by John W. Linville
parent 382b16559d
commit 723bae7ee4
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/ieee80211_i.h
View File

@@ -299,7 +299,6 @@ struct ieee80211_work {
} assoc; } assoc;
struct { struct {
u32 duration; u32 duration;
bool started;
} remain; } remain;
}; };

17
net/mac80211/work.c
View File

@@ -535,8 +535,7 @@ ieee80211_remain_on_channel_timeout(struct ieee80211_work *wk)
* First time we run, do nothing -- the generic code will * First time we run, do nothing -- the generic code will
* have switched to the right channel etc. * have switched to the right channel etc.
*/ */
if (!wk->remain.started) { if (!wk->started) {
wk->remain.started = true;
wk->timeout = jiffies + msecs_to_jiffies(wk->remain.duration); wk->timeout = jiffies + msecs_to_jiffies(wk->remain.duration);
cfg80211_ready_on_channel(wk->sdata->dev, (unsigned long) wk, cfg80211_ready_on_channel(wk->sdata->dev, (unsigned long) wk,
@@ -821,15 +820,17 @@ static void ieee80211_work_work(struct work_struct *work)
mutex_lock(&local->work_mtx); mutex_lock(&local->work_mtx);
list_for_each_entry_safe(wk, tmp, &local->work_list, list) { list_for_each_entry_safe(wk, tmp, &local->work_list, list) {
bool started = wk->started;
/* mark work as started if it's on the current off-channel */ /* mark work as started if it's on the current off-channel */
if (!wk->started && local->tmp_channel && if (!started && local->tmp_channel &&
wk->chan == local->tmp_channel && wk->chan == local->tmp_channel &&
wk->chan_type == local->tmp_channel_type) { wk->chan_type == local->tmp_channel_type) {
wk->started = true; started = true;
wk->timeout = jiffies; wk->timeout = jiffies;
} }
if (!wk->started && !local->tmp_channel) { if (!started && !local->tmp_channel) {
/* /*
* TODO: could optimize this by leaving the * TODO: could optimize this by leaving the
* station vifs in awake mode if they * station vifs in awake mode if they
@@ -842,12 +843,12 @@ static void ieee80211_work_work(struct work_struct *work)
local->tmp_channel = wk->chan; local->tmp_channel = wk->chan;
local->tmp_channel_type = wk->chan_type; local->tmp_channel_type = wk->chan_type;
ieee80211_hw_config(local, 0); ieee80211_hw_config(local, 0);
wk->started = true; started = true;
wk->timeout = jiffies; wk->timeout = jiffies;
} }
/* don't try to work with items that aren't started */ /* don't try to work with items that aren't started */
if (!wk->started) if (!started)
continue; continue;
if (time_is_after_jiffies(wk->timeout)) { if (time_is_after_jiffies(wk->timeout)) {
@@ -882,6 +883,8 @@ static void ieee80211_work_work(struct work_struct *work)
break; break;
} }
wk->started = started;
switch (rma) { switch (rma) {
case WORK_ACT_NONE: case WORK_ACT_NONE:
/* might have changed the timeout */ /* might have changed the timeout */