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

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

mac80211: add basic support for WoWLAN 



This adds basic support for the new WoWLAN
configuration in mac80211. The behaviour is
completely offloaded to the driver though,
with two new callbacks (suspend/resume).

Options for the driver include a complete
reconfiguration after wakeup, and exposing
all the triggers it wants to support.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ff1b6e69

include/net/mac80211.h

+16 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,18 @@ enum ieee80211_ampdu_mlme_action { 
 *	you should ensure to cancel it on this callback.

 *	Must be implemented and can sleep.

 *

 * @suspend: Suspend the device; mac80211 itself will quiesce before and

 *	stop transmitting and doing any other configuration, and then

 *	ask the device to suspend. This is only invoked when WoWLAN is

 *	configured, otherwise the device is deconfigured completely and

 *	reconfigured at resume time.

 *

 * @resume: If WoWLAN was configured, this indicates that mac80211 is

 *	now resuming its operation, after this the device must be fully

 *	functional again. If this returns an error, the only way out is

 *	to also unregister the device. If it returns 1, then mac80211

 *	will also go through the regular complete restart on resume.

 *

 * @add_interface: Called when a netdevice attached to the hardware is

 *	enabled. Because it is not called for monitor mode devices, @start

 *	and @stop must be implemented.
@@ -1831,6 +1843,10 @@ struct ieee80211_ops { 
	void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);

	int (*start)(struct ieee80211_hw *hw);

	void (*stop)(struct ieee80211_hw *hw);

#ifdef CONFIG_PM

	int (*suspend)(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);

	int (*resume)(struct ieee80211_hw *hw);

#endif

	int (*add_interface)(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif);

	int (*change_interface)(struct ieee80211_hw *hw,

net/mac80211/cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ static int ieee80211_set_channel(struct wiphy *wiphy, 
static int ieee80211_suspend(struct wiphy *wiphy,

			     struct cfg80211_wowlan *wowlan)

{

	return __ieee80211_suspend(wiphy_priv(wiphy));

	return __ieee80211_suspend(wiphy_priv(wiphy), wowlan);

}



static int ieee80211_resume(struct wiphy *wiphy)

net/mac80211/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static ssize_t reset_write(struct file *file, const char __user *user_buf, 
	struct ieee80211_local *local = file->private_data;



	rtnl_lock();

	__ieee80211_suspend(&local->hw);

	__ieee80211_suspend(&local->hw, NULL);

	__ieee80211_resume(&local->hw);

	rtnl_unlock();

net/mac80211/driver-ops.h

+27 −0
Original line number Diff line number Diff line
@@ -41,6 +41,33 @@ static inline void drv_stop(struct ieee80211_local *local) 
	local->started = false;

}



#ifdef CONFIG_PM

static inline int drv_suspend(struct ieee80211_local *local,

			      struct cfg80211_wowlan *wowlan)

{

	int ret;



	might_sleep();



	trace_drv_suspend(local);

	ret = local->ops->suspend(&local->hw, wowlan);

	trace_drv_return_int(local, ret);

	return ret;

}



static inline int drv_resume(struct ieee80211_local *local)

{

	int ret;



	might_sleep();



	trace_drv_resume(local);

	ret = local->ops->resume(&local->hw);

	trace_drv_return_int(local, ret);

	return ret;

}

#endif



static inline int drv_add_interface(struct ieee80211_local *local,

				    struct ieee80211_vif *vif)

{

net/mac80211/driver-trace.h

+10 −0
Original line number Diff line number Diff line
@@ -108,6 +108,16 @@ DEFINE_EVENT(local_only_evt, drv_start, 
	TP_ARGS(local)

);



DEFINE_EVENT(local_only_evt, drv_suspend,

	TP_PROTO(struct ieee80211_local *local),

	TP_ARGS(local)

);



DEFINE_EVENT(local_only_evt, drv_resume,

	TP_PROTO(struct ieee80211_local *local),

	TP_ARGS(local)

);



DEFINE_EVENT(local_only_evt, drv_stop,

	TP_PROTO(struct ieee80211_local *local),

	TP_ARGS(local)