diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-14 12:32:15 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-14 12:32:15 +0000 |
| commit | f58d5ed0c4c47aa8dbcc4f7a58e4c52752ce6511 (patch) | |
| tree | fb4b04d21b4d8654b0e7a615f2b3bc445b48d08c /drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | eb192460ccd50e73475b6092a8953ef7945921c8 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10/be/32/core-20140413' of git://git.linaro.org/people/victor.kamensky/linux-linaro-tracking-be into lsk-v3.10-bev3.10/topic/old-arm64-bev3.10/topic/be
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h index 51e015d1dfb2..6f8b2c16ae17 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h +++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h @@ -75,13 +75,15 @@ enum iwl_d3_wakeup_flags { * struct iwl_d3_manager_config - D3 manager configuration command * @min_sleep_time: minimum sleep time (in usec) * @wakeup_flags: wakeup flags, see &enum iwl_d3_wakeup_flags + * @wakeup_host_timer: force wakeup after this many seconds * * The structure is used for the D3_CONFIG_CMD command. */ struct iwl_d3_manager_config { __le32 min_sleep_time; __le32 wakeup_flags; -} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_3 */ + __le32 wakeup_host_timer; +} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_4 */ /* TODO: OFFLOADS_QUERY_API_S_VER_1 */ |