Changeset 30449
- Timestamp:
- 2012-02-11T16:12:08+01:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/target/linux/ramips/files/drivers/net/ramips.c
r30448 r30449 130 130 for (i = 0; i < NUM_RX_DESC; i++) 131 131 if (re->rx_skb[i]) { 132 dma_unmap_single( NULL, re->rx_dma[i], MAX_RX_LENGTH,133 DMA_FROM_DEVICE);132 dma_unmap_single(&re->netdev->dev, re->rx_dma[i], 133 MAX_RX_LENGTH, DMA_FROM_DEVICE); 134 134 dev_kfree_skb_any(re->rx_skb[i]); 135 135 } 136 136 137 137 if (re->rx) 138 dma_free_coherent( NULL,138 dma_free_coherent(&re->netdev->dev, 139 139 NUM_RX_DESC * sizeof(struct ramips_rx_dma), 140 140 re->rx, re->rx_desc_dma); 141 141 142 142 if (re->tx) 143 dma_free_coherent( NULL,143 dma_free_coherent(&re->netdev->dev, 144 144 NUM_TX_DESC * sizeof(struct ramips_tx_dma), 145 145 re->tx, re->tx_desc_dma); … … 155 155 156 156 /* setup tx ring */ 157 re->tx = dma_alloc_coherent( NULL,157 re->tx = dma_alloc_coherent(&re->netdev->dev, 158 158 NUM_TX_DESC * sizeof(struct ramips_tx_dma), 159 159 &re->tx_desc_dma, GFP_ATOMIC); … … 168 168 169 169 /* setup rx ring */ 170 re->rx = dma_alloc_coherent( NULL,170 re->rx = dma_alloc_coherent(&re->netdev->dev, 171 171 NUM_RX_DESC * sizeof(struct ramips_rx_dma), 172 172 &re->rx_desc_dma, GFP_ATOMIC); … … 185 185 skb_reserve(new_skb, NET_IP_ALIGN); 186 186 187 dma_addr = dma_map_single( NULL, new_skb->data,187 dma_addr = dma_map_single(&re->netdev->dev, new_skb->data, 188 188 MAX_RX_LENGTH, DMA_FROM_DEVICE); 189 189 re->rx_dma[i] = dma_addr; … … 235 235 236 236 dev->trans_start = jiffies; 237 mapped_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE); 237 mapped_addr = dma_map_single(&priv->netdev->dev, skb->data, skb->len, 238 DMA_TO_DEVICE); 238 239 239 240 spin_lock(&priv->page_lock); … … 289 290 dma_addr_t dma_addr; 290 291 291 dma_unmap_single( NULL, priv->rx_dma[rx], MAX_RX_LENGTH,292 DMA_FROM_DEVICE);292 dma_unmap_single(&priv->netdev->dev, priv->rx_dma[rx], 293 MAX_RX_LENGTH, DMA_FROM_DEVICE); 293 294 294 295 skb_put(rx_skb, pktlen); … … 303 304 skb_reserve(new_skb, NET_IP_ALIGN); 304 305 305 dma_addr = dma_map_single( NULL,306 dma_addr = dma_map_single(&priv->netdev->dev, 306 307 new_skb->data, 307 308 MAX_RX_LENGTH,
Note: See TracChangeset
for help on using the changeset viewer.