From 24a537437a661a62a029925c4cd22ae93c709188 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 27 Jun 2011 07:48:52 -0700 Subject: [PATCH] --- yaml --- r: 254659 b: refs/heads/master c: 1107a08a1a3e0f54d535d37ee0c4192acce6a7f3 h: refs/heads/master i: 254657: 0a7b687944d9357ec2fce60488ccd526a9d08e98 254655: 1acddd8c3ea9b9aa4847b31b2907e1d7deca9b15 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-tx.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index fef36ec0a41f..08f90d593d8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5306c0807491e891125f4fb08b04340c91530f57 +refs/heads/master: 1107a08a1a3e0f54d535d37ee0c4192acce6a7f3 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c index 157a642a5436..8f20065e6dac 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -310,10 +310,7 @@ void iwl_cmd_queue_unmap(struct iwl_priv *priv) i = get_cmd_index(q, q->read_ptr); if (txq->meta[i].flags & CMD_MAPPED) { - pci_unmap_single(priv->pci_dev, - dma_unmap_addr(&txq->meta[i], mapping), - dma_unmap_len(&txq->meta[i], len), - PCI_DMA_BIDIRECTIONAL); + iwlagn_unmap_tfd(priv, &txq->meta[i], &txq->tfds[i]); txq->meta[i].flags = 0; }