p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ftgmac100: Split tx packet freeing from ftgmac100_tx_complete_packet() 

This moves the packet freeing to a separate function
which is also used by ftgmac100_free_buffers() and will
be used more in the error path of fragmented sends.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Benjamin Herrenschmidt 2017-04-10 11:15:23 +10:00 committed by David S. Miller
parent 4a2712b2f0
commit 42c2d19786
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/net/ethernet/faraday/ftgmac100.c
View File

@ -563,13 +563,29 @@ static bool ftgmac100_tx_buf_cleanable(struct ftgmac100 *priv)
return priv->tx_pointer != priv->tx_clean_pointer; return priv->tx_pointer != priv->tx_clean_pointer;
} }
static void ftgmac100_free_tx_packet(struct ftgmac100 *priv,
unsigned int pointer,
struct sk_buff *skb,
struct ftgmac100_txdes *txdes)
{
dma_addr_t map;
map = ftgmac100_txdes_get_dma_addr(txdes);
dma_unmap_single(priv->dev, map, skb_headlen(skb), DMA_TO_DEVICE);
dev_kfree_skb(skb);
priv->tx_skbs[pointer] = NULL;
ftgmac100_txdes_reset(priv, txdes);
}
static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv) static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv)
{ {
struct net_device *netdev = priv->netdev; struct net_device *netdev = priv->netdev;
struct ftgmac100_txdes *txdes; struct ftgmac100_txdes *txdes;
unsigned int pointer;
struct sk_buff *skb; struct sk_buff *skb;
dma_addr_t map; unsigned int pointer;
pointer = priv->tx_clean_pointer; pointer = priv->tx_clean_pointer;
txdes = &priv->descs->txdes[pointer]; txdes = &priv->descs->txdes[pointer];
@ -578,17 +594,9 @@ static bool ftgmac100_tx_complete_packet(struct ftgmac100 *priv)
return false; return false;
skb = priv->tx_skbs[pointer]; skb = priv->tx_skbs[pointer];
map = ftgmac100_txdes_get_dma_addr(txdes);
netdev->stats.tx_packets++; netdev->stats.tx_packets++;
netdev->stats.tx_bytes += skb->len; netdev->stats.tx_bytes += skb->len;
ftgmac100_free_tx_packet(priv, pointer, skb, txdes);
dma_unmap_single(priv->dev, map, skb_headlen(skb), DMA_TO_DEVICE);
dev_kfree_skb(skb);
priv->tx_skbs[pointer] = NULL;
ftgmac100_txdes_reset(priv, txdes);
priv->tx_clean_pointer = ftgmac100_next_tx_pointer(pointer); priv->tx_clean_pointer = ftgmac100_next_tx_pointer(pointer);
@ -729,13 +737,9 @@ static void ftgmac100_free_buffers(struct ftgmac100 *priv)
for (i = 0; i < TX_QUEUE_ENTRIES; i++) { for (i = 0; i < TX_QUEUE_ENTRIES; i++) {
struct ftgmac100_txdes *txdes = &priv->descs->txdes[i]; struct ftgmac100_txdes *txdes = &priv->descs->txdes[i];
struct sk_buff *skb = priv->tx_skbs[i]; struct sk_buff *skb = priv->tx_skbs[i];
dma_addr_t map = ftgmac100_txdes_get_dma_addr(txdes);
if (!skb) if (skb)
continue; ftgmac100_free_tx_packet(priv, i, skb, txdes);
dma_unmap_single(priv->dev, map, skb_headlen(skb), DMA_TO_DEVICE);
kfree_skb(skb);
} }
} }