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

Commit 77572fd1 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

mac80211: quiesce vif before suspending 



Cancel all relevant timers/works before suspending (wowlan).

This patch handles the following warning:
WARNING: at net/mac80211/util.c:565 queueing ieee80211 work while going to suspend
Backtrace:
[<bf07b598>] (ieee80211_can_queue_work+0x0/0x4c [mac80211])
[<bf07c28c>] (ieee80211_queue_work+0x0/0x30 [mac80211])
[<bf0690dc>] (ieee80211_sta_timer+0x0/0x3c [mac80211])
[<c00a3008>] (run_timer_softirq+0x0/0x220)
[<c009e530>] (__do_softirq+0x0/0x130)
[<c009e660>] (irq_exit+0x0/0xb4)
[<c004c4a0>] (ipi_timer+0x0/0x4c)
[<c0046350>] (do_local_timer+0x0/0x88)
[<c00488ec>] (cpu_idle+0x0/0xe0)
[<c05294e8>] (rest_init+0x0/0xe0)
[<c0008958>] (start_kernel+0x0/0x314)

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6392cb38

net/mac80211/pm.c

+27 −16
Original line number Original line Diff line number Diff line
@@ -6,6 +6,28 @@ 
#include "driver-ops.h"

#include "driver-ops.h"

#include "led.h"

#include "led.h"





/* return value indicates whether the driver should be further notified */

static bool ieee80211_quiesce(struct ieee80211_sub_if_data *sdata)

{

	switch (sdata->vif.type) {

	case NL80211_IFTYPE_STATION:

		ieee80211_sta_quiesce(sdata);

		return true;

	case NL80211_IFTYPE_ADHOC:

		ieee80211_ibss_quiesce(sdata);

		return true;

	case NL80211_IFTYPE_MESH_POINT:

		ieee80211_mesh_quiesce(sdata);

		return true;

	case NL80211_IFTYPE_AP_VLAN:

	case NL80211_IFTYPE_MONITOR:

		/* don't tell driver about this */

		return false;

	default:

		return true;

	}

}



int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)

int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)

{

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct ieee80211_local *local = hw_to_local(hw);
@@ -54,6 +76,10 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
			local->quiescing = false;

			local->quiescing = false;

			return err;

			return err;

		}

		}

		list_for_each_entry(sdata, &local->interfaces, list) {

			cancel_work_sync(&sdata->work);

			ieee80211_quiesce(sdata);

		}

		goto suspend;

		goto suspend;

	}

	}
@@ -82,23 +108,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) 
	list_for_each_entry(sdata, &local->interfaces, list) {

	list_for_each_entry(sdata, &local->interfaces, list) {

		cancel_work_sync(&sdata->work);

		cancel_work_sync(&sdata->work);





		switch(sdata->vif.type) {

		if (!ieee80211_quiesce(sdata))

		case NL80211_IFTYPE_STATION:

			ieee80211_sta_quiesce(sdata);

			break;

		case NL80211_IFTYPE_ADHOC:

			ieee80211_ibss_quiesce(sdata);

			break;

		case NL80211_IFTYPE_MESH_POINT:

			ieee80211_mesh_quiesce(sdata);

			break;

		case NL80211_IFTYPE_AP_VLAN:

		case NL80211_IFTYPE_MONITOR:

			/* don't tell driver about this */

			continue;

			continue;

		default:

			break;

		}





		if (!ieee80211_sdata_running(sdata))

		if (!ieee80211_sdata_running(sdata))

			continue;

			continue;