This is a note to let you know that I've just added the patch titled
iwlwifi: Complete backport of "iwlwifi: always copy first 16 bytes of commands"
to the 3.4-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-complete-backport-of-iwlwifi-always-copy-first-16-bytes-of-commands.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From ben@xxxxxxxxxxxxxxx Tue Mar 25 13:41:21 2014
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Date: Tue, 25 Mar 2014 17:28:22 +0000
Subject: iwlwifi: Complete backport of "iwlwifi: always copy first 16 bytes of commands"
To: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx, stable@xxxxxxxxxxxxxxx, Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>, Johannes Berg <johannes.berg@xxxxxxxxx>, Jianguo Wu <wujianguo@xxxxxxxxxx>, Andres Bertens <abertensu@xxxxxxxxx>, Andreas Sturmlechner <andreas.sturmlechner@xxxxxxxxx>
Message-ID: <1395768502.28354.7.camel@xxxxxxxxxxxxxxxxxxxxxxxxxx>
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Linux 3.4.83 included an incomplete backport of commit
8a964f44e01ad3bbc208c3e80d931ba91b9ea786 ('iwlwifi: always copy first
16 bytes of commands') which causes a regression for this driver.
This is the missing piece.
Reported-by: Andreas Sturmlechner <andreas.sturmlechner@xxxxxxxxx>
Cc: Johannes Berg <johannes.berg@xxxxxxxxx>
Cc: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx>
Cc: Jianguo Wu <wujianguo@xxxxxxxxxx>
Cc: Andres Bertens <abertensu@xxxxxxxxx>
Tested-by: Andreas Sturmlechner <andreas.sturmlechner@xxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c
@@ -825,14 +825,15 @@ static int iwl_enqueue_hcmd(struct iwl_t
trace_idx = 1;
#endif
+ /* map the remaining (adjusted) nocopy/dup fragments */
for (i = 0; i < IWL_MAX_CMD_TFDS; i++) {
- if (!cmd->len[i])
+ if (!cmdlen[i])
continue;
if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))
continue;
phys_addr = dma_map_single(trans->dev,
- (void *)cmd->data[i],
- cmd->len[i], DMA_BIDIRECTIONAL);
+ (void *)cmddata[i],
+ cmdlen[i], DMA_BIDIRECTIONAL);
if (dma_mapping_error(trans->dev, phys_addr)) {
iwlagn_unmap_tfd(trans, out_meta,
&txq->tfds[q->write_ptr],
Patches currently in stable-queue which might be from ben@xxxxxxxxxxxxxxx are
queue-3.4/iwlwifi-complete-backport-of-iwlwifi-always-copy-first-16-bytes-of-commands.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