From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 2 Mar 2010 13:36:18 +0000 (+0000)
Subject: ar71xx: ag71xx: use correct device pointer for dma_map_single
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0e4eaea770608e157530e7190651041008c93f96;p=openwrt%2Fstaging%2Fneocturne.git

ar71xx: ag71xx: use correct device pointer for dma_map_single

SVN-Revision: 19951
---

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
index 7bc19a0ec1..74593ddcc4 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
@@ -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)
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index b1fb21f244..a3edd43aaf 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -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;