mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ar71xx: ag71xx: use correct device pointer for dma_map_single

Browse Source 
SVN-Revision: 19951
This commit is contained in:
Gabor Juhos 2010-03-02 13:36:18 +00:00
parent 84823e1477
commit 0e4eaea770
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h
View File

@ -38,7 +38,7 @@
#define ETH_FCS_LEN 4 #define ETH_FCS_LEN 4
#define AG71XX_DRV_NAME "ag71xx" #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_NAPI_WEIGHT 64
#define AG71XX_OOM_REFILL (1 + HZ/10) #define AG71XX_OOM_REFILL (1 + HZ/10)

8
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View File

@ -219,7 +219,8 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
skb->dev = ag->dev; skb->dev = ag->dev;
skb_reserve(skb, AG71XX_RX_PKT_RESERVE); 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); DMA_FROM_DEVICE);
ring->buf[i].skb = skb; ring->buf[i].skb = skb;
ring->buf[i].desc->data = (u32) dma_addr; 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_reserve(skb, AG71XX_RX_PKT_RESERVE);
skb->dev = ag->dev; 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, AG71XX_RX_PKT_SIZE,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
@ -515,7 +516,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
goto err_drop; 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; ring->buf[i].skb = skb;