ar71xx: ag71xx: use correct device pointer for dma_map_single
authorGabor Juhos <juhosg@openwrt.org>
Tue, 2 Mar 2010 13:36:18 +0000 (13:36 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Tue, 2 Mar 2010 13:36:18 +0000 (13:36 +0000)
SVN-Revision: 19951

target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c

index 7bc19a0ec1c58b208bc0d2c231a7ce076586197f..74593ddcc4086a6cef4c9cd072dfbf4241202251 100644 (file)
@@ -38,7 +38,7 @@
 #define ETH_FCS_LEN    4
 
 #define AG71XX_DRV_NAME                "ag71xx"
-#define AG71XX_DRV_VERSION     "0.5.28"
+#define AG71XX_DRV_VERSION     "0.5.29"
 
 #define AG71XX_NAPI_WEIGHT     64
 #define AG71XX_OOM_REFILL      (1 + HZ/10)
index b1fb21f2444c563924f6712948cad445741e793a..a3edd43aaf30e3a22de44630ad751f4139d249da 100644 (file)
@@ -219,7 +219,8 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
                skb->dev = ag->dev;
                skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
 
-               dma_addr = dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE,
+               dma_addr = dma_map_single(&ag->dev->dev, skb->data,
+                                         AG71XX_RX_PKT_SIZE,
                                          DMA_FROM_DEVICE);
                ring->buf[i].skb = skb;
                ring->buf[i].desc->data = (u32) dma_addr;
@@ -258,7 +259,7 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
                        skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
                        skb->dev = ag->dev;
 
-                       dma_addr = dma_map_single(NULL, skb->data,
+                       dma_addr = dma_map_single(&ag->dev->dev, skb->data,
                                                  AG71XX_RX_PKT_SIZE,
                                                  DMA_FROM_DEVICE);
 
@@ -515,7 +516,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
                goto err_drop;
        }
 
-       dma_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+       dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
+                                 DMA_TO_DEVICE);
 
        ring->buf[i].skb = skb;