ar71xx: ag71xx: don't use virt_to_phys

[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c

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 64b5cc8..b1fb21f 100644 (file)
--- 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;
@@ -491,11 +493,13 @@ static int ag71xx_stop(struct net_device *dev)
        return 0;
 }
 
-static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
+                                         struct net_device *dev)
 {
        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;
@@ -511,12 +515,12 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
                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 */
@@ -535,13 +539,13 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        dev->trans_start = jiffies;
 
-       return 0;
+       return NETDEV_TX_OK;
 
  err_drop:
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)