net: convert e1000 to netdev_kfree_skb My test machine has an e1000, and the driver already uses netdev_alloc_skb(). Signed-off-by: Rusty Russell --- drivers/net/e1000/e1000_main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c @@ -2086,7 +2086,7 @@ static void e1000_unmap_and_free_tx_reso buffer_info->dma = 0; } if (buffer_info->skb) { - dev_kfree_skb_any(buffer_info->skb); + netdev_kfree_skb(buffer_info->skb); buffer_info->skb = NULL; } /* buffer_info must be completely set up in the transmit path */ @@ -2203,7 +2203,7 @@ static void e1000_clean_rx_ring(struct e buffer_info->length, PCI_DMA_FROMDEVICE); - dev_kfree_skb(buffer_info->skb); + netdev_kfree_skb(buffer_info->skb); buffer_info->skb = NULL; } } @@ -3219,7 +3219,7 @@ static int e1000_xmit_frame(struct sk_bu tx_ring = adapter->tx_ring; if (unlikely(skb->len <= 0)) { - dev_kfree_skb_any(skb); + netdev_kfree_skb_any(skb); return NETDEV_TX_OK; } @@ -3265,7 +3265,7 @@ static int e1000_xmit_frame(struct sk_bu if (!__pskb_pull_tail(skb, pull_size)) { DPRINTK(DRV, ERR, "__pskb_pull_tail failed.\n"); - dev_kfree_skb_any(skb); + netdev_kfree_skb_any(skb); return NETDEV_TX_OK; } len = skb->len - skb->data_len; @@ -3339,7 +3339,7 @@ static int e1000_xmit_frame(struct sk_bu tso = e1000_tso(adapter, tx_ring, skb); if (tso < 0) { - dev_kfree_skb_any(skb); + netdev_kfree_skb_any(skb); spin_unlock_irqrestore(&tx_ring->tx_lock, flags); return NETDEV_TX_OK; } @@ -4176,19 +4176,19 @@ static void e1000_alloc_rx_buffers(struc skb = netdev_alloc_skb(netdev, bufsz); /* Failed allocation, critical failure */ if (!skb) { - dev_kfree_skb(oldskb); + netdev_kfree_skb(oldskb); break; } if (!e1000_check_64k_bound(adapter, skb->data, bufsz)) { /* give up */ - dev_kfree_skb(skb); - dev_kfree_skb(oldskb); + netdev_kfree_skb(skb); + netdev_kfree_skb(oldskb); break; /* while !buffer_info->skb */ } /* Use new allocation */ - dev_kfree_skb(oldskb); + netdev_kfree_skb(oldskb); } /* Make buffer alignment 2 beyond a 16 byte boundary * this will result in a 16 byte aligned IP header after