diff options
| author | Johannes Berg | 2012-04-04 15:05:25 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-04-11 22:23:57 +0200 |
| commit | 6d52563f2bc217cbdccb97068f5b6176352f01f2 (patch) | |
| tree | 27fb48e360f153129fadb4dd5abdb4d91bb2e7eb /include/net/cfg80211.h | |
| parent | wireless: Remove unnecessary ; from while (0) macros (diff) | |
| download | kernel-qcow2-linux-6d52563f2bc217cbdccb97068f5b6176352f01f2.tar.gz kernel-qcow2-linux-6d52563f2bc217cbdccb97068f5b6176352f01f2.tar.xz kernel-qcow2-linux-6d52563f2bc217cbdccb97068f5b6176352f01f2.zip | |
cfg80211/mac80211: enable proper device_set_wakeup_enable handling
In WoWLAN, we only get the triggers when we actually get
to suspend. As a consequence, drivers currently don't
know that the device should enable wakeup. However, the
device_set_wakeup_enable() API is intended to be called
when the wakeup is enabled, not later when needed.
Add a new set_wakeup() call to cfg80211 and mac80211 to
allow drivers to properly call device_set_wakeup_enable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/cfg80211.h')
| -rw-r--r-- | include/net/cfg80211.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index ae3a3bb37bf2..1fd1c4acfc8e 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1344,6 +1344,9 @@ struct cfg80211_gtk_rekey_data { * be %NULL or contain the enabled Wake-on-Wireless triggers that are * configured for the device. * @resume: wiphy device needs to be resumed + * @set_wakeup: Called when WoWLAN is enabled/disabled, use this callback + * to call device_set_wakeup_enable() to enable/disable wakeup from + * the device. * * @add_virtual_intf: create a new virtual interface with the given name, * must set the struct wireless_dev's iftype. Beware: You must create @@ -1515,6 +1518,7 @@ struct cfg80211_gtk_rekey_data { struct cfg80211_ops { int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); int (*resume)(struct wiphy *wiphy); + void (*set_wakeup)(struct wiphy *wiphy, bool enabled); struct net_device * (*add_virtual_intf)(struct wiphy *wiphy, char *name, |