ramips: free allocated skbs in ramips_cleanup_dma

[openwrt.git] / target / linux / ramips / files / drivers / net / ramips.c

diff --git a/target/linux/ramips/files/drivers/net/ramips.c b/target/linux/ramips/files/drivers/net/ramips.c
index 13645e2..43ccdfc 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips.c
+++ b/target/linux/ramips/files/drivers/net/ramips.c
@@ -16,18 +16,13 @@
  */
 
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
-#include <linux/if_vlan.h>
-#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
 #include <linux/platform_device.h>
-#include <asm/uaccess.h>
-#include <net/sock.h>
-#include <asm/uaccess.h>
 
 #include <eth.h>
 
@@ -55,6 +50,23 @@ ramips_fe_rr(unsigned reg)
        return __raw_readl(ramips_fe_base + reg);
 }
 
+static void
+ramips_cleanup_dma(struct net_device *dev)
+{
+       struct raeth_priv *priv = netdev_priv(dev);
+       int i;
+
+       for (i = 0; i < NUM_RX_DESC; i++)
+               if (priv->rx_skb[i])
+                       dev_kfree_skb_any(priv->rx_skb[i]);
+
+       dma_free_coherent(NULL, NUM_RX_DESC * sizeof(struct ramips_rx_dma),
+               priv->rx, priv->phy_rx);
+
+       dma_free_coherent(NULL, NUM_TX_DESC * sizeof(struct ramips_tx_dma),
+               priv->tx, priv->phy_tx);
+}
+
 static int
 ramips_alloc_dma(struct net_device *dev)
 {
@@ -73,10 +85,6 @@ ramips_alloc_dma(struct net_device *dev)
                priv->tx[i].txd4 &= (TX_DMA_QN_MASK | TX_DMA_PN_MASK);
                priv->tx[i].txd4 |= TX_DMA_QN(3) | TX_DMA_PN(1);
        }
-       ramips_fe_wr(phys_to_bus(priv->phy_tx), RAMIPS_TX_BASE_PTR0);
-       ramips_fe_wr(NUM_TX_DESC, RAMIPS_TX_MAX_CNT0);
-       ramips_fe_wr(0, RAMIPS_TX_CTX_IDX0);
-       ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
 
        /* setup rx ring */
        priv->rx = dma_alloc_coherent(NULL,
@@ -93,12 +101,24 @@ ramips_alloc_dma(struct net_device *dev)
                priv->rx[i].rxd2 |= RX_DMA_LSO;
                priv->rx_skb[i] = new_skb;
        }
+
+       return 0;
+}
+
+static void
+ramips_setup_dma(struct net_device *dev)
+{
+       struct raeth_priv *priv = netdev_priv(dev);
+
+       ramips_fe_wr(phys_to_bus(priv->phy_tx), RAMIPS_TX_BASE_PTR0);
+       ramips_fe_wr(NUM_TX_DESC, RAMIPS_TX_MAX_CNT0);
+       ramips_fe_wr(0, RAMIPS_TX_CTX_IDX0);
+       ramips_fe_wr(RAMIPS_PST_DTX_IDX0, RAMIPS_PDMA_RST_CFG);
+
        ramips_fe_wr(phys_to_bus(priv->phy_rx), RAMIPS_RX_BASE_PTR0);
        ramips_fe_wr(NUM_RX_DESC, RAMIPS_RX_MAX_CNT0);
        ramips_fe_wr((NUM_RX_DESC - 1), RAMIPS_RX_CALC_IDX0);
        ramips_fe_wr(RAMIPS_PST_DRX_IDX0, RAMIPS_PDMA_RST_CFG);
-
-       return 0;
 }
 
 static int
@@ -264,6 +284,7 @@ ramips_eth_open(struct net_device *dev)
        struct raeth_priv *priv = netdev_priv(dev);
 
        ramips_alloc_dma(dev);
+       ramips_setup_dma(dev);
        ramips_fe_wr((ramips_fe_rr(RAMIPS_PDMA_GLO_CFG) & 0xff) |
                (RAMIPS_TX_WB_DDONE | RAMIPS_RX_DMA_EN |
                RAMIPS_TX_DMA_EN | RAMIPS_PDMA_SIZE_4DWORDS),
@@ -302,10 +323,7 @@ ramips_eth_stop(struct net_device *dev)
        netif_stop_queue(dev);
        tasklet_kill(&priv->tx_housekeeping_tasklet);
        tasklet_kill(&priv->rx_tasklet);
-       dma_free_coherent(NULL, NUM_TX_DESC * sizeof(struct ramips_tx_dma),
-               priv->tx, priv->phy_tx);
-       dma_free_coherent(NULL, NUM_RX_DESC * sizeof(struct ramips_rx_dma),
-               priv->rx, priv->phy_rx);
+       ramips_cleanup_dma(dev);
        printk(KERN_DEBUG "ramips_eth: stopped\n");
        return 0;
 }