diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-13 14:05:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 14:05:40 -0400 |
| commit | 1f7e0102820f11a0dcd3a2f90140abf14c894ba8 (patch) | |
| tree | 2ae08acbb26ddb2fa662db63c1dd111c0b5b646f /include | |
| parent | 6ddcd46463aa66855f1f8e74de454740a5f4aef4 (diff) | |
| parent | 79543d8eecc0957ac6fe3ec1e2486ad31d4b67a3 (diff) | |
| download | linux-3.10-1f7e0102820f11a0dcd3a2f90140abf14c894ba8.tar.gz linux-3.10-1f7e0102820f11a0dcd3a2f90140abf14c894ba8.tar.bz2 linux-3.10-1f7e0102820f11a0dcd3a2f90140abf14c894ba8.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 1937c7d9830..95e39b6a02e 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1940,6 +1940,11 @@ enum ieee80211_rate_control_changed { * to also unregister the device. If it returns 1, then mac80211 * will also go through the regular complete restart on resume. * + * @set_wakeup: Enable or disable wakeup when WoWLAN configuration is + * modified. The reason is that device_set_wakeup_enable() is + * supposed to be called when the configuration changes, not only + * in suspend(). + * * @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. @@ -2966,6 +2971,7 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw, * ieee80211_generic_frame_duration - Calculate the duration field for a frame * @hw: pointer obtained from ieee80211_alloc_hw(). * @vif: &struct ieee80211_vif pointer from the add_interface callback. + * @band: the band to calculate the frame duration on * @frame_len: the length of the frame. * @rate: the rate at which the frame is going to be transmitted. * |