aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
index d5b9adfc3cce..74343589f284 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c
@@ -305,7 +305,7 @@ static void iwlagn_rx_allocate(struct iwl_priv *priv, gfp_t priority)
305 BUG_ON(rxb->page); 305 BUG_ON(rxb->page);
306 rxb->page = page; 306 rxb->page = page;
307 /* Get physical address of the RB */ 307 /* Get physical address of the RB */
308 rxb->page_dma = dma_map_page(priv->bus.dev, page, 0, 308 rxb->page_dma = dma_map_page(priv->bus->dev, page, 0,
309 PAGE_SIZE << priv->hw_params.rx_page_order, 309 PAGE_SIZE << priv->hw_params.rx_page_order,
310 DMA_FROM_DEVICE); 310 DMA_FROM_DEVICE);
311 /* dma address must be no more than 36 bits */ 311 /* dma address must be no more than 36 bits */
@@ -404,7 +404,7 @@ static void iwl_rx_handle(struct iwl_priv *priv)
404 404
405 rxq->queue[i] = NULL; 405 rxq->queue[i] = NULL;
406 406
407 dma_unmap_page(priv->bus.dev, rxb->page_dma, 407 dma_unmap_page(priv->bus->dev, rxb->page_dma,
408 PAGE_SIZE << priv->hw_params.rx_page_order, 408 PAGE_SIZE << priv->hw_params.rx_page_order,
409 DMA_FROM_DEVICE); 409 DMA_FROM_DEVICE);
410 pkt = rxb_addr(rxb); 410 pkt = rxb_addr(rxb);
@@ -455,7 +455,7 @@ static void iwl_rx_handle(struct iwl_priv *priv)
455 * rx_free list for reuse later. */ 455 * rx_free list for reuse later. */
456 spin_lock_irqsave(&rxq->lock, flags); 456 spin_lock_irqsave(&rxq->lock, flags);
457 if (rxb->page != NULL) { 457 if (rxb->page != NULL) {
458 rxb->page_dma = dma_map_page(priv->bus.dev, rxb->page, 458 rxb->page_dma = dma_map_page(priv->bus->dev, rxb->page,
459 0, PAGE_SIZE << priv->hw_params.rx_page_order, 459 0, PAGE_SIZE << priv->hw_params.rx_page_order,
460 DMA_FROM_DEVICE); 460 DMA_FROM_DEVICE);
461 list_add_tail(&rxb->list, &rxq->rx_free); 461 list_add_tail(&rxb->list, &rxq->rx_free);
@@ -704,7 +704,7 @@ void iwl_irq_tasklet(struct iwl_priv *priv)
704void iwl_free_isr_ict(struct iwl_priv *priv) 704void iwl_free_isr_ict(struct iwl_priv *priv)
705{ 705{
706 if (priv->_agn.ict_tbl_vir) { 706 if (priv->_agn.ict_tbl_vir) {
707 dma_free_coherent(priv->bus.dev, 707 dma_free_coherent(priv->bus->dev,
708 (sizeof(u32) * ICT_COUNT) + PAGE_SIZE, 708 (sizeof(u32) * ICT_COUNT) + PAGE_SIZE,
709 priv->_agn.ict_tbl_vir, 709 priv->_agn.ict_tbl_vir,
710 priv->_agn.ict_tbl_dma); 710 priv->_agn.ict_tbl_dma);
@@ -725,7 +725,7 @@ int iwl_alloc_isr_ict(struct iwl_priv *priv)
725 725
726 /* allocate shrared data table */ 726 /* allocate shrared data table */
727 priv->_agn.ict_tbl_vir = 727 priv->_agn.ict_tbl_vir =
728 dma_alloc_coherent(priv->bus.dev, 728 dma_alloc_coherent(priv->bus->dev,
729 (sizeof(u32) * ICT_COUNT) + PAGE_SIZE, 729 (sizeof(u32) * ICT_COUNT) + PAGE_SIZE,
730 &priv->_agn.ict_tbl_dma, GFP_KERNEL); 730 &priv->_agn.ict_tbl_dma, GFP_KERNEL);
731 if (!priv->_agn.ict_tbl_vir) 731 if (!priv->_agn.ict_tbl_vir)