KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: ag71xx: don't use virt_to_phys

Browse source 
SVN-Revision: 19950
This commit is contained in:
Gabor Juhos 2010-03-02 13:36:15 +00:00
parent 4a987d6008
commit 84823e1477
2 changed files with 17 additions and 14 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 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)

29
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
View file

@ -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 */