aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-05-15 05:44:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-29 12:47:31 -0400
commitb460440f81f11175bdc657ee28a2421f8a02d209 (patch)
tree0d8d7c05d061d623791b7b4a39c866b733c5b7ea
parenta76139c02f366c601a6895c1a1c1c6d26ec7d469 (diff)
iwlwifi: mvm: adjust firmware D3 configuration API
commit dfcb4c3aacedee6838e436fb575b31e138505203 upstream. The D3 firmware API changed to include a new field, adjust the driver to it to avoid getting an NMI when configuring. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h4
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 {
75 * struct iwl_d3_manager_config - D3 manager configuration command 75 * struct iwl_d3_manager_config - D3 manager configuration command
76 * @min_sleep_time: minimum sleep time (in usec) 76 * @min_sleep_time: minimum sleep time (in usec)
77 * @wakeup_flags: wakeup flags, see &enum iwl_d3_wakeup_flags 77 * @wakeup_flags: wakeup flags, see &enum iwl_d3_wakeup_flags
78 * @wakeup_host_timer: force wakeup after this many seconds
78 * 79 *
79 * The structure is used for the D3_CONFIG_CMD command. 80 * The structure is used for the D3_CONFIG_CMD command.
80 */ 81 */
81struct iwl_d3_manager_config { 82struct iwl_d3_manager_config {
82 __le32 min_sleep_time; 83 __le32 min_sleep_time;
83 __le32 wakeup_flags; 84 __le32 wakeup_flags;
84} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_3 */ 85 __le32 wakeup_host_timer;
86} __packed; /* D3_MANAGER_CONFIG_CMD_S_VER_4 */
85 87
86 88
87/* TODO: OFFLOADS_QUERY_API_S_VER_1 */ 89/* TODO: OFFLOADS_QUERY_API_S_VER_1 */