diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2010-03-02 13:36:15 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2010-03-02 13:36:15 +0000 |
commit | 84823e1477732daacedcafbf31a787b293941830 (patch) | |
tree | 7da9538073893befb2c95db7db863c26562d3979 /target/linux/ar71xx/files/drivers | |
parent | 4a987d60085a8a78d77fb9b30abde20e6673e28c (diff) | |
download | upstream-84823e1477732daacedcafbf31a787b293941830.tar.gz upstream-84823e1477732daacedcafbf31a787b293941830.tar.bz2 upstream-84823e1477732daacedcafbf31a787b293941830.zip |
ar71xx: ag71xx: don't use virt_to_phys
SVN-Revision: 19950
Diffstat (limited to 'target/linux/ar71xx/files/drivers')
-rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h | 2 | ||||
-rw-r--r-- | target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c | 29 |
2 files changed, 17 insertions, 14 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index 881ffa3693..7bc19a0ec1 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.27" +#define AG71XX_DRV_VERSION "0.5.28" #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 a8be41b52d..b1fb21f244 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -11,7 +11,6 @@ * by the Free Software Foundation. */ -#include <linux/cache.h> #include "ag71xx.h" #define AG71XX_DEFAULT_MSG_ENABLE \ @@ -209,21 +208,21 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag) for (i = 0; i < AG71XX_RX_RING_SIZE; i++) { struct sk_buff *skb; + dma_addr_t dma_addr; - skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE); + skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + AG71XX_RX_PKT_RESERVE); if (!skb) { ret = -ENOMEM; break; } - dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE, - DMA_FROM_DEVICE); - skb->dev = ag->dev; skb_reserve(skb, AG71XX_RX_PKT_RESERVE); + dma_addr = dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE, + DMA_FROM_DEVICE); ring->buf[i].skb = skb; - ring->buf[i].desc->data = virt_to_phys(skb->data); + ring->buf[i].desc->data = (u32) dma_addr; ring->buf[i].desc->ctrl = DESC_EMPTY; } @@ -248,20 +247,23 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag) i = ring->dirty % AG71XX_RX_RING_SIZE; if (ring->buf[i].skb == NULL) { + dma_addr_t dma_addr; struct sk_buff *skb; - skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE); + skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + + AG71XX_RX_PKT_RESERVE); if (skb == NULL) break; - dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE, - DMA_FROM_DEVICE); - skb_reserve(skb, AG71XX_RX_PKT_RESERVE); skb->dev = ag->dev; + dma_addr = dma_map_single(NULL, skb->data, + AG71XX_RX_PKT_SIZE, + DMA_FROM_DEVICE); + ring->buf[i].skb = skb; - ring->buf[i].desc->data = virt_to_phys(skb->data); + ring->buf[i].desc->data = (u32) dma_addr; } ring->buf[i].desc->ctrl = DESC_EMPTY; @@ -497,6 +499,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, struct ag71xx *ag = netdev_priv(dev); struct ag71xx_ring *ring = &ag->tx_ring; struct ag71xx_desc *desc; + dma_addr_t dma_addr; int i; i = ring->curr % AG71XX_TX_RING_SIZE; @@ -512,12 +515,12 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, goto err_drop; } - dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE); + dma_addr = dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE); ring->buf[i].skb = skb; /* setup descriptor fields */ - desc->data = virt_to_phys(skb->data); + desc->data = (u32) dma_addr; desc->ctrl = (skb->len & DESC_PKTLEN_M); /* flush descriptor */ |