diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
commit | b3e30c9884407599353e690a4eb36d0c4671bf62 (patch) | |
tree | d752d32d8a1a395cacd220313f24b933b2ed7294 /drivers/net/wireless/intel/iwlwifi/pcie/tx.c | |
parent | 342061c53a049569fc7f56d237753c26b4b2166d (diff) | |
parent | a55aa89aab90fae7c815b0551b07be37db359d76 (diff) |
Merge tag 'v5.3-rc6' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/pcie/tx.c')
-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 fa4245d0d4a8..2f0ba7ef53b8 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c @@ -435,6 +435,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; |