aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index bcb94a01f94a..b49f9f7a8a67 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -444,7 +444,7 @@ void iwl_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq)
444 pci_unmap_single(dev, 444 pci_unmap_single(dev,
445 pci_unmap_addr(&txq->cmd[index]->meta, mapping), 445 pci_unmap_addr(&txq->cmd[index]->meta, mapping),
446 pci_unmap_len(&txq->cmd[index]->meta, len), 446 pci_unmap_len(&txq->cmd[index]->meta, len),
447 PCI_DMA_TODEVICE); 447 PCI_DMA_BIDIRECTIONAL);
448 448
449 /* Unmap chunks, if any. */ 449 /* Unmap chunks, if any. */
450 for (i = 1; i < num_tbs; i++) { 450 for (i = 1; i < num_tbs; i++) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index ae04c2086f70..dff60fb70214 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -819,7 +819,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
819 * within command buffer array. */ 819 * within command buffer array. */
820 txcmd_phys = pci_map_single(priv->pci_dev, 820 txcmd_phys = pci_map_single(priv->pci_dev,
821 out_cmd, sizeof(struct iwl_cmd), 821 out_cmd, sizeof(struct iwl_cmd),
822 PCI_DMA_TODEVICE); 822 PCI_DMA_BIDIRECTIONAL);
823 pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys); 823 pci_unmap_addr_set(&out_cmd->meta, mapping, txcmd_phys);
824 pci_unmap_len_set(&out_cmd->meta, len, sizeof(struct iwl_cmd)); 824 pci_unmap_len_set(&out_cmd->meta, len, sizeof(struct iwl_cmd));
825 /* Add buffer containing Tx command and MAC(!) header to TFD's 825 /* Add buffer containing Tx command and MAC(!) header to TFD's
@@ -968,7 +968,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
968 IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd); 968 IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd);
969 969
970 phys_addr = pci_map_single(priv->pci_dev, out_cmd, 970 phys_addr = pci_map_single(priv->pci_dev, out_cmd,
971 len, PCI_DMA_TODEVICE); 971 len, PCI_DMA_BIDIRECTIONAL);
972 pci_unmap_addr_set(&out_cmd->meta, mapping, phys_addr); 972 pci_unmap_addr_set(&out_cmd->meta, mapping, phys_addr);
973 pci_unmap_len_set(&out_cmd->meta, len, len); 973 pci_unmap_len_set(&out_cmd->meta, len, len);
974 phys_addr += offsetof(struct iwl_cmd, hdr); 974 phys_addr += offsetof(struct iwl_cmd, hdr);
@@ -1068,7 +1068,7 @@ static void iwl_hcmd_queue_reclaim(struct iwl_priv *priv, int txq_id,
1068 pci_unmap_single(priv->pci_dev, 1068 pci_unmap_single(priv->pci_dev,
1069 pci_unmap_addr(&txq->cmd[cmd_idx]->meta, mapping), 1069 pci_unmap_addr(&txq->cmd[cmd_idx]->meta, mapping),
1070 pci_unmap_len(&txq->cmd[cmd_idx]->meta, len), 1070 pci_unmap_len(&txq->cmd[cmd_idx]->meta, len),
1071 PCI_DMA_TODEVICE); 1071 PCI_DMA_BIDIRECTIONAL);
1072 1072
1073 for (idx = iwl_queue_inc_wrap(idx, q->n_bd); q->read_ptr != idx; 1073 for (idx = iwl_queue_inc_wrap(idx, q->n_bd); q->read_ptr != idx;
1074 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) { 1074 q->read_ptr = iwl_queue_inc_wrap(q->read_ptr, q->n_bd)) {