diff options
| author | Emmanuel Grumbach | 2019-07-21 13:02:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-08-16 10:12:53 +0200 |
| commit | 7626b510fc77c6828a1989fd3d032597f934d347 (patch) | |
| tree | d1e55101f8472081f3fd126b1183a2caed898230 | |
| parent | mwifiex: fix 802.11n/WPA detection (diff) | |
| download | kernel-qcow2-linux-7626b510fc77c6828a1989fd3d032597f934d347.tar.gz kernel-qcow2-linux-7626b510fc77c6828a1989fd3d032597f934d347.tar.xz kernel-qcow2-linux-7626b510fc77c6828a1989fd3d032597f934d347.zip | |
iwlwifi: don't unmap as page memory that was mapped as single
commit 87e7e25aee6b59fef740856f4e86d4b60496c9e1 upstream.
In order to remember how to unmap a memory (as single or
as page), we maintain a bit per Transmit Buffer (TBs) in
the meta data (structure iwl_cmd_meta).
We maintain a bitmap: 1 bit per TB.
If the TB is set, we will free the memory as a page.
This bitmap was never cleared. Fix this.
Cc: stable@vger.kernel.org
Fixes: 3cd1980b0cdf ("iwlwifi: pcie: introduce new tfd and tb formats")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c index 93f0d387688a..42fdb7970cfd 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -403,6 +403,8 @@ static void iwl_pcie_tfd_unmap(struct iwl_trans *trans, DMA_TO_DEVICE); } + meta->tbs = 0; + if (trans->cfg->use_tfh) { struct iwl_tfh_tfd *tfd_fh = (void *)tfd; |