diff options
author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-04 21:49:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:41:20 -0500 |
commit | 1d266430546acf01438ae42d0a7370db4817e2ad (patch) | |
tree | 149268ba8ad2b3288ae001e5ab28146e4361a6d0 /drivers/net/ethernet/amd/sunlance.c | |
parent | 3238a9be4d7ad95c741bcfe6c147406eeef62d95 (diff) |
netdev: ethernet dev_alloc_skb to netdev_alloc_skb
Replaced deprecating dev_alloc_skb with netdev_alloc_skb in drivers/net/ethernet
- Removed extra skb->dev = dev after netdev_alloc_skb
Signed-off-by: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/sunlance.c')
-rw-r--r-- | drivers/net/ethernet/amd/sunlance.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c index 7ea16d32a5f5..e3fe3504e198 100644 --- a/drivers/net/ethernet/amd/sunlance.c +++ b/drivers/net/ethernet/amd/sunlance.c | |||
@@ -534,7 +534,7 @@ static void lance_rx_dvma(struct net_device *dev) | |||
534 | if (bits & LE_R1_EOP) dev->stats.rx_errors++; | 534 | if (bits & LE_R1_EOP) dev->stats.rx_errors++; |
535 | } else { | 535 | } else { |
536 | len = (rd->mblength & 0xfff) - 4; | 536 | len = (rd->mblength & 0xfff) - 4; |
537 | skb = dev_alloc_skb(len + 2); | 537 | skb = netdev_alloc_skb(dev, len + 2); |
538 | 538 | ||
539 | if (skb == NULL) { | 539 | if (skb == NULL) { |
540 | printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n", | 540 | printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n", |
@@ -706,7 +706,7 @@ static void lance_rx_pio(struct net_device *dev) | |||
706 | if (bits & LE_R1_EOP) dev->stats.rx_errors++; | 706 | if (bits & LE_R1_EOP) dev->stats.rx_errors++; |
707 | } else { | 707 | } else { |
708 | len = (sbus_readw(&rd->mblength) & 0xfff) - 4; | 708 | len = (sbus_readw(&rd->mblength) & 0xfff) - 4; |
709 | skb = dev_alloc_skb(len + 2); | 709 | skb = netdev_alloc_skb(dev, len + 2); |
710 | 710 | ||
711 | if (skb == NULL) { | 711 | if (skb == NULL) { |
712 | printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n", | 712 | printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n", |