summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-08 14:22:57 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-11-08 14:22:57 -0500
commit51dd4b3526e0024a905e83fa31e5258226c14493 (patch)
tree5121a8def5dad3f74e97daceb5682407ca703aea
parentb96441f3d6d8541552bc2b6512fa9503146b8c49 (diff)
downloadlongterm-queue-4.8-51dd4b3526e0024a905e83fa31e5258226c14493.tar.gz
iwlwifi: drop another patch n/a for 4.8.x
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/iwlwifi-pcie-fix-the-set-of-DMA-memory-mask.patch43
-rw-r--r--queue/series1
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/iwlwifi-pcie-fix-the-set-of-DMA-memory-mask.patch b/queue/iwlwifi-pcie-fix-the-set-of-DMA-memory-mask.patch
deleted file mode 100644
index e3ad1c1..0000000
--- a/queue/iwlwifi-pcie-fix-the-set-of-DMA-memory-mask.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2c6262b754f3c3338cb40b23880a3ac1f4693b25 Mon Sep 17 00:00:00 2001
-From: Sara Sharon <sara.sharon@intel.com>
-Date: Wed, 7 Dec 2016 12:22:11 +0200
-Subject: [PATCH] iwlwifi: pcie: fix the set of DMA memory mask
-
-commit 2c6262b754f3c3338cb40b23880a3ac1f4693b25 upstream.
-
-Our 9000 device supports 64 bit DMA address for RX only, and
-not for TX.
-Setting DMA mask to 64 for the whole device is erroneous - we
-can do it only for a000 devices where device is capable of
-both RX & TX DMA with 64 bit address space.
-
-Fixes: 96a6497bc3ed ("iwlwifi: pcie: add 9000 series multi queue rx DMA support")
-Signed-off-by: Sara Sharon <sara.sharon@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-
-diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-index c1d99d15796d..b28d99f61a35 100644
---- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -2953,16 +2953,12 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
- PCIE_LINK_STATE_CLKPM);
- }
-
-- if (cfg->mq_rx_supported)
-- addr_size = 64;
-- else
-- addr_size = 36;
--
- if (cfg->use_tfh) {
-+ addr_size = 64;
- trans_pcie->max_tbs = IWL_TFH_NUM_TBS;
- trans_pcie->tfd_size = sizeof(struct iwl_tfh_tfd);
--
- } else {
-+ addr_size = 36;
- trans_pcie->max_tbs = IWL_NUM_OF_TBS;
- trans_pcie->tfd_size = sizeof(struct iwl_tfd);
- }
---
-2.12.0
-
diff --git a/queue/series b/queue/series
index 6fc4f4b..f05afb2 100644
--- a/queue/series
+++ b/queue/series
@@ -84,7 +84,6 @@ mwifiex-Avoid-skipping-WEP-key-deletion-for-AP.patch
iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch
iwlwifi-mvm-overwrite-skb-info-later.patch
iwlwifi-pcie-don-t-increment-decrement-a-bool.patch
-iwlwifi-pcie-fix-the-set-of-DMA-memory-mask.patch
iwlwifi-mvm-fix-reorder-timer-re-arming.patch
iwlwifi-mvm-Use-aux-queue-for-offchannel-frames-in-d.patch
iwlwifi-mvm-pcie-adjust-A-MSDU-tx_cmd-length-in-PCIe.patch