lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gianfar: Simplify skb resources freeing code

Browse Source 
Remove dma_free_coherent() from stop_gfar() and gfar_start() calls,
place it into free_skb_resources(). That makes SKB resources management
more understandable, plus free_skb_resources() will be used as a cleanup
routine for gfar_alloc_skb_resources() that will be implemented soon.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anton Vorontsov
2009-10-12 06:00:30 +00:00
committed by David S. Miller
parent ccc05c6e1e
commit e69edd2181
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/gianfar.c
View File

@@ -806,7 +806,6 @@ void gfar_halt(struct net_device *dev)
void stop_gfar(struct net_device *dev) void stop_gfar(struct net_device *dev)
{ {
struct gfar_private *priv = netdev_priv(dev); struct gfar_private *priv = netdev_priv(dev);
struct gfar __iomem *regs = priv->regs;
unsigned long flags; unsigned long flags;
phy_stop(priv->phydev); phy_stop(priv->phydev);
@@ -830,18 +829,13 @@ void stop_gfar(struct net_device *dev)
} }
free_skb_resources(priv); free_skb_resources(priv);
dma_free_coherent(&priv->ofdev->dev,
sizeof(struct txbd8)*priv->tx_ring_size
+ sizeof(struct rxbd8)*priv->rx_ring_size,
priv->tx_bd_base,
gfar_read(&regs->tbase0));
} }
/* If there are any tx skbs or rx skbs still around, free them. /* If there are any tx skbs or rx skbs still around, free them.
* Then free tx_skbuff and rx_skbuff */ * Then free tx_skbuff and rx_skbuff */
static void free_skb_resources(struct gfar_private *priv) static void free_skb_resources(struct gfar_private *priv)
{ {
struct device *dev = &priv->ofdev->dev;
struct rxbd8 *rxbdp; struct rxbd8 *rxbdp;
struct txbd8 *txbdp; struct txbd8 *txbdp;
int i, j; int i, j;
@@ -849,6 +843,9 @@ static void free_skb_resources(struct gfar_private *priv)
/* Go through all the buffer descriptors and free their data buffers */ /* Go through all the buffer descriptors and free their data buffers */
txbdp = priv->tx_bd_base; txbdp = priv->tx_bd_base;
if (!priv->tx_skbuff)
goto skip_tx_skbuff;
for (i = 0; i < priv->tx_ring_size; i++) { for (i = 0; i < priv->tx_ring_size; i++) {
if (!priv->tx_skbuff[i]) if (!priv->tx_skbuff[i])
continue; continue;
@@ -867,30 +864,33 @@ static void free_skb_resources(struct gfar_private *priv)
} }
kfree(priv->tx_skbuff); kfree(priv->tx_skbuff);
skip_tx_skbuff:
rxbdp = priv->rx_bd_base; rxbdp = priv->rx_bd_base;
/* rx_skbuff is not guaranteed to be allocated, so only if (!priv->rx_skbuff)
* free it and its contents if it is allocated */ goto skip_rx_skbuff;
if(priv->rx_skbuff != NULL) {
for (i = 0; i < priv->rx_ring_size; i++) { for (i = 0; i < priv->rx_ring_size; i++) {
if (priv->rx_skbuff[i]) { if (priv->rx_skbuff[i]) {
dma_unmap_single(&priv->ofdev->dev, rxbdp->bufPtr, dma_unmap_single(&priv->ofdev->dev, rxbdp->bufPtr,
priv->rx_buffer_size, priv->rx_buffer_size,
DMA_FROM_DEVICE); DMA_FROM_DEVICE);
dev_kfree_skb_any(priv->rx_skbuff[i]); dev_kfree_skb_any(priv->rx_skbuff[i]);
priv->rx_skbuff[i] = NULL; priv->rx_skbuff[i] = NULL;
} }
rxbdp->lstatus = 0; rxbdp->lstatus = 0;
rxbdp->bufPtr = 0; rxbdp->bufPtr = 0;
rxbdp++; rxbdp++;
} }
kfree(priv->rx_skbuff); kfree(priv->rx_skbuff);
} skip_rx_skbuff:
dma_free_coherent(dev, sizeof(*txbdp) * priv->tx_ring_size +
sizeof(*rxbdp) * priv->rx_ring_size,
priv->tx_bd_base, gfar_read(&priv->regs->tbase0));
} }
void gfar_start(struct net_device *dev) void gfar_start(struct net_device *dev)
@@ -1148,11 +1148,8 @@ tx_irq_fail:
err_irq_fail: err_irq_fail:
err_rxalloc_fail: err_rxalloc_fail:
rx_skb_fail: rx_skb_fail:
free_skb_resources(priv);
tx_skb_fail: tx_skb_fail:
dma_free_coherent(dev, sizeof(*txbdp) * priv->tx_ring_size + free_skb_resources(priv);
sizeof(*rxbdp) * priv->rx_ring_size,
priv->tx_bd_base, gfar_read(&regs->tbase0));
return err; return err;
} }