diff options
| author | Johannes Berg | 2013-01-11 00:28:01 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-01-16 15:19:01 +0100 |
| commit | 8f21b0adfe95907926da1bb0bcd3382b13d0143d (patch) | |
| tree | 8eeedd57fd51a88baa61d38ef5602689eea3d675 /include/net/mac80211.h | |
| parent | mac80211: fix resume from WoWLAN (diff) | |
| download | kernel-qcow2-linux-8f21b0adfe95907926da1bb0bcd3382b13d0143d.tar.gz kernel-qcow2-linux-8f21b0adfe95907926da1bb0bcd3382b13d0143d.tar.xz kernel-qcow2-linux-8f21b0adfe95907926da1bb0bcd3382b13d0143d.zip | |
mac80211: call restart complete at wowlan resume time
When the driver's resume function can't completely
restore the configuration in the device, it returns
1 from the callback which will be treated like a HW
restart request, but done directly.
In this case, also call the driver's restart_complete()
function so it can finish the reconfiguration there.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/mac80211.h')
| -rw-r--r-- | include/net/mac80211.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 79bc8709e83b..3037f49e51c8 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2488,7 +2488,10 @@ enum ieee80211_rate_control_changed { * * @restart_complete: Called after a call to ieee80211_restart_hw(), when the * reconfiguration has completed. This can help the driver implement the - * reconfiguration step. This callback may sleep. + * reconfiguration step. Also called when reconfiguring because the + * driver's resume function returned 1, as this is just like an "inline" + * hardware restart. This callback may sleep. + * */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw, |