Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 723bae7e authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: track work started through callbacks 



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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 382b1655

net/mac80211/ieee80211_i.h

+0 −1
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ struct ieee80211_work { 
		} assoc;

		struct {

			u32 duration;

			bool started;

		} remain;

	};

net/mac80211/work.c

+10 −7
Original line number Diff line number Diff line
@@ -535,8 +535,7 @@ ieee80211_remain_on_channel_timeout(struct ieee80211_work *wk) 
	 * First time we run, do nothing -- the generic code will

	 * have switched to the right channel etc.

	 */

	if (!wk->remain.started) {

		wk->remain.started = true;

	if (!wk->started) {

		wk->timeout = jiffies + msecs_to_jiffies(wk->remain.duration);



		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);



	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 */

		if (!wk->started && local->tmp_channel &&

		if (!started && local->tmp_channel &&

		    wk->chan == local->tmp_channel &&

		    wk->chan_type == local->tmp_channel_type) {

			wk->started = true;

			started = true;

			wk->timeout = jiffies;

		}



		if (!wk->started && !local->tmp_channel) {

		if (!started && !local->tmp_channel) {

			/*

			 * TODO: could optimize this by leaving the

			 *	 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_type = wk->chan_type;

			ieee80211_hw_config(local, 0);

			wk->started = true;

			started = true;

			wk->timeout = jiffies;

		}



		/* don't try to work with items that aren't started */

		if (!wk->started)

		if (!started)

			continue;



		if (time_is_after_jiffies(wk->timeout)) {
@@ -882,6 +883,8 @@ static void ieee80211_work_work(struct work_struct *work) 
			break;

		}



		wk->started = started;



		switch (rma) {

		case WORK_ACT_NONE:

			/* might have changed the timeout */