From ee12427e21752bbc8bac874f56c56183419ea157 Mon Sep 17 00:00:00 2001 From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Tue, 2 Mar 2010 13:36:18 +0000 Subject: ar71xx: ag71xx: use correct device pointer for dma_map_single git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19951 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h | 2 +- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 7bc19a0ec..74593ddcc 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 b1fb21f24..a3edd43aa 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; -- cgit v1.2.3