Commit 8808f641 authored Dec 13, 2010 by Herton Ronaldo Krzesinski Committed by John W. Linville Dec 13, 2010

mac80211: avoid calling ieee80211_work_work unconditionally

On suspend, there might be usb wireless drivers which wrongly trigger
the warning in ieee80211_work_work. If an usb driver doesn't have a
suspend hook, the usb stack will disconnect the device. On disconnect,
a mac80211 driver calls ieee80211_unregister_hw, which calls dev_close,
which calls ieee80211_stop, and in the end calls ieee80211_work_purge->
ieee80211_work_work.

The problem is that this call to ieee80211_work_purge comes after
mac80211 is suspended, triggering the warning even when we don't have
work queued in work_list (the expected case when already suspended),
because it always calls ieee80211_work_work.

So, just call ieee80211_work_work in ieee80211_work_purge if we really
have to abort work. This addresses the warning reported at
https://bugzilla.kernel.org/show_bug.cgi?id=24402



Signed-off-by: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 16cad7fb

net/mac80211/work.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1051,11 +1051,13 @@ void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata)
		{
		struct ieee80211_local *local = sdata->local;
		struct ieee80211_work *wk;
		bool cleanup = false;

		mutex_lock(&local->mtx);
		list_for_each_entry(wk, &local->work_list, list) {
		if (wk->sdata != sdata)
		continue;
		cleanup = true;
		wk->type = IEEE80211_WORK_ABORT;
		wk->started = true;
		wk->timeout = jiffies;
		@@ -1063,6 +1065,7 @@ void ieee80211_work_purge(struct ieee80211_sub_if_data *sdata)
		mutex_unlock(&local->mtx);

		/* run cleanups etc. */
		if (cleanup)
		ieee80211_work_work(&local->work_work);

		mutex_lock(&local->mtx);

Admin message