Commit 76cba8fd authored by Yang Wei's avatar Yang Wei Committed by David S. Miller
Browse files

net: dlink: sundance: replace dev_kfree_skb_irq by dev_consume_skb_irq for drop profiles 



dev_consume_skb_irq() should be called in intr_handler() when skb
xmit done. It makes drop profiles(dropwatch, perf) more friendly.

Remove a redundant blank line in intr_handler().

Signed-off-by: default avatarYang Wei <yang.wei9@zte.com.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent feb558c2

drivers/net/ethernet/dlink/sundance.c

+2 −3
Original line number Diff line number Diff line
@@ -1193,7 +1193,6 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) 
	int handled = 0;

	int i;





	do {

		int intr_status = ioread16(ioaddr + IntrStatus);

		iowrite16(intr_status, ioaddr + IntrStatus);
@@ -1286,7 +1285,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) 
				dma_unmap_single(&np->pci_dev->dev,

					le32_to_cpu(np->tx_ring[entry].frag[0].addr),

					skb->len, DMA_TO_DEVICE);

				dev_kfree_skb_irq (np->tx_skbuff[entry]);

				dev_consume_skb_irq(np->tx_skbuff[entry]);

				np->tx_skbuff[entry] = NULL;

				np->tx_ring[entry].frag[0].addr = 0;

				np->tx_ring[entry].frag[0].length = 0;
@@ -1305,7 +1304,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) 
				dma_unmap_single(&np->pci_dev->dev,

					le32_to_cpu(np->tx_ring[entry].frag[0].addr),

					skb->len, DMA_TO_DEVICE);

				dev_kfree_skb_irq (np->tx_skbuff[entry]);

				dev_consume_skb_irq(np->tx_skbuff[entry]);

				np->tx_skbuff[entry] = NULL;

				np->tx_ring[entry].frag[0].addr = 0;

				np->tx_ring[entry].frag[0].length = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE