]> git.baikalelectronics.ru Git - kernel.git/commitdiff
hp100: Convert the normal skb free path to dev_consume_skb_any()
authorRick Jones <rick.jones2@hp.com>
Mon, 8 Sep 2014 15:31:32 +0000 (08:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 22:39:58 +0000 (15:39 -0700)
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>
drivers/net/ethernet/hp/hp100.c

index ed7916f6fbcff0731118843123e5af2d351f5b64..76a6e0c77d69e1a01544a388b465e7e82ddbfd87 100644 (file)
@@ -1627,7 +1627,7 @@ static void hp100_clean_txring(struct net_device *dev)
 #endif
                /* Conversion to new PCI API : NOP */
                pci_unmap_single(lp->pci_dev, (dma_addr_t) lp->txrhead->pdl[1], lp->txrhead->pdl[2], PCI_DMA_TODEVICE);
-               dev_kfree_skb_any(lp->txrhead->skb);
+               dev_consume_skb_any(lp->txrhead->skb);
                lp->txrhead->skb = NULL;
                lp->txrhead = lp->txrhead->next;
                lp->txrcommit--;
@@ -1745,7 +1745,7 @@ static netdev_tx_t hp100_start_xmit(struct sk_buff *skb,
        hp100_ints_on();
        spin_unlock_irqrestore(&lp->lock, flags);
 
-       dev_kfree_skb_any(skb);
+       dev_consume_skb_any(skb);
 
 #ifdef HP100_DEBUG_TX
        printk("hp100: %s: start_xmit: end\n", dev->name);