aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Jones <rick.jones2@hp.com>2014-09-08 11:31:32 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-08 18:39:58 -0400
commit119eccd5e7f6fcded9db6b7aa14f5f459d2a22ba (patch)
tree8787ccb31ed47e67dc74a3271ff70a2978922df6
parent1e701f16982a9d15488a5aa8c7f5c41444b1de67 (diff)
hp100: Convert the normal skb free path to dev_consume_skb_any()
A bit of floor sweeping in a dusty old corner. Convert the "normal" skb free calls to dev_consume_skb_any() so packet drop tracing will be more sane. Signed-off-by: Rick Jones <rick.jones2@hp.com> Acked-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/hp/hp100.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index ed7916f6fbcf..76a6e0c77d69 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c
@@ -1627,7 +1627,7 @@ static void hp100_clean_txring(struct net_device *dev)
1627#endif 1627#endif
1628 /* Conversion to new PCI API : NOP */ 1628 /* Conversion to new PCI API : NOP */
1629 pci_unmap_single(lp->pci_dev, (dma_addr_t) lp->txrhead->pdl[1], lp->txrhead->pdl[2], PCI_DMA_TODEVICE); 1629 pci_unmap_single(lp->pci_dev, (dma_addr_t) lp->txrhead->pdl[1], lp->txrhead->pdl[2], PCI_DMA_TODEVICE);
1630 dev_kfree_skb_any(lp->txrhead->skb); 1630 dev_consume_skb_any(lp->txrhead->skb);
1631 lp->txrhead->skb = NULL; 1631 lp->txrhead->skb = NULL;
1632 lp->txrhead = lp->txrhead->next; 1632 lp->txrhead = lp->txrhead->next;
1633 lp->txrcommit--; 1633 lp->txrcommit--;
@@ -1745,7 +1745,7 @@ static netdev_tx_t hp100_start_xmit(struct sk_buff *skb,
1745 hp100_ints_on(); 1745 hp100_ints_on();
1746 spin_unlock_irqrestore(&lp->lock, flags); 1746 spin_unlock_irqrestore(&lp->lock, flags);
1747 1747
1748 dev_kfree_skb_any(skb); 1748 dev_consume_skb_any(skb);
1749 1749
1750#ifdef HP100_DEBUG_TX 1750#ifdef HP100_DEBUG_TX
1751 printk("hp100: %s: start_xmit: end\n", dev->name); 1751 printk("hp100: %s: start_xmit: end\n", dev->name);