This is a note to let you know that I've just added the patch titled
iwlwifi: mvm: adjust firmware D3 configuration API
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iwlwifi-mvm-adjust-firmware-d3-configuration-api.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From dfcb4c3aacedee6838e436fb575b31e138505203 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@xxxxxxxxx>
Date: Wed, 15 May 2013 11:44:49 +0200
Subject: iwlwifi: mvm: adjust firmware D3 configuration API
From: Johannes Berg <johannes.berg@xxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- 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 */
Patches currently in stable-queue which might be from johannes.berg@xxxxxxxxx are
queue-3.10/mac80211-don-t-wait-for-tx-status-forever.patch
queue-3.10/iwlwifi-mvm-take-the-seqno-from-packet-if-transmit-failed.patch
queue-3.10/iwlwifi-mvm-correctly-configure-mcast-in-ap-mode.patch
queue-3.10/iwlwifi-mvm-don-t-set-the-mcast-queue-in-sta-s-queue-list.patch
queue-3.10/iwlwifi-mvm-properly-tell-the-fw-that-a-sta-is-awake.patch
queue-3.10/iwlwifi-bump-required-firmware-api-version-for-3160-7260.patch
queue-3.10/iwlwifi-mvm-fix-mcast-in-ap-mode.patch
queue-3.10/iwlwifi-mvm-adjust-firmware-d3-configuration-api.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html