[PATCH net] amd/lance.c: dev_alloc_skb to netdev_alloc_skb
From: Pradeep A. Dalvi <hidden>
Date: 2012-01-25 18:47:03
Also in:
lkml
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Replaced deprecating dev_alloc_skb with netdev_alloc_skb for amd/lance.c - Removed extra skb->dev = dev Signed-off-by: Pradeep A. Dalvi <redacted> --- drivers/net/ethernet/amd/lance.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c
index a6e2e84..a8a6b45 100644
--- a/drivers/net/ethernet/amd/lance.c
+++ b/drivers/net/ethernet/amd/lance.c@@ -871,12 +871,11 @@ lance_init_ring(struct net_device *dev, gfp_t gfp) struct sk_buff *skb; void *rx_buff; - skb = alloc_skb(PKT_BUF_SZ, GFP_DMA | gfp); + skb = __netdev_alloc_skb(dev, PKT_BUF_SZ, GFP_DMA | gfp); lp->rx_skbuff[i] = skb; - if (skb) { - skb->dev = dev; + if (skb) rx_buff = skb->data; - } else + else rx_buff = kmalloc(PKT_BUF_SZ, GFP_DMA | gfp); if (rx_buff == NULL) lp->rx_ring[i].base = 0;
@@ -1183,7 +1182,7 @@ lance_rx(struct net_device *dev) } else { - skb = dev_alloc_skb(pkt_len+2); + skb = netdev_alloc_skb(dev, pkt_len + 2); if (skb == NULL) { printk("%s: Memory squeeze, deferring packet.\n", dev->name);