From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org, linux-wireless@vger.kernel.org,
Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH 3.10 8/8] iwlwifi: mvm: adjust firmware D3 configuration API
Date: Wed, 21 Aug 2013 09:04:26 +0300 [thread overview]
Message-ID: <1377065066-13030-8-git-send-email-emmanuel.grumbach@intel.com> (raw)
In-Reply-To: <1377065066-13030-1-git-send-email-emmanuel.grumbach@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
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>
---
drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h
index 51e015d..6f8b2c1 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 */
--
1.7.10.4
prev parent reply other threads:[~2013-08-21 6:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 6:04 [PATCH 3.10 1/8] iwlwifi: mvm: correctly configure MCAST in AP mode Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 2/8] iwlwifi: mvm: fix " Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 3/8] iwlwifi: mvm: properly tell the fw that a STA is awake Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 4/8] iwlwifi: mvm: don't set the MCAST queue in STA's queue list Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 5/8] iwlwifi: mvm: take the seqno from packet if transmit failed Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 6/8] iwlwifi: mvm: unregister leds when registration failed Emmanuel Grumbach
2013-08-21 6:04 ` [PATCH 3.10 7/8] iwlwifi: bump required firmware API version for 3160/7260 Emmanuel Grumbach
2013-08-21 6:04 ` Emmanuel Grumbach [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377065066-13030-8-git-send-email-emmanuel.grumbach@intel.com \
--to=emmanuel.grumbach@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=johannes.berg@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox