diff options
| author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-05 02:49:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:41:20 -0500 |
| commit | 1d266430546acf01438ae42d0a7370db4817e2ad (patch) | |
| tree | 149268ba8ad2b3288ae001e5ab28146e4361a6d0 /drivers/net/ethernet/3com/3c59x.c | |
| parent | 3238a9be4d7ad95c741bcfe6c147406eeef62d95 (diff) | |
| download | linux-1d266430546acf01438ae42d0a7370db4817e2ad.tar.bz2 | |
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/3com/3c59x.c')
| -rw-r--r-- | drivers/net/ethernet/3com/3c59x.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c index dc51d9218e6d..1282f048dfad 100644 --- a/drivers/net/ethernet/3com/3c59x.c +++ b/drivers/net/ethernet/3com/3c59x.c @@ -2499,7 +2499,7 @@ static int vortex_rx(struct net_device *dev) int pkt_len = rx_status & 0x1fff; struct sk_buff *skb; - skb = dev_alloc_skb(pkt_len + 5); + skb = netdev_alloc_skb(dev, pkt_len + 5); if (vortex_debug > 4) pr_debug("Receiving packet size %d status %4.4x.\n", pkt_len, rx_status); @@ -2578,7 +2578,8 @@ boomerang_rx(struct net_device *dev) /* Check if the packet is long enough to just accept without copying to a properly sized skbuff. */ - if (pkt_len < rx_copybreak && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { + if (pkt_len < rx_copybreak && + (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) { skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ pci_dma_sync_single_for_cpu(VORTEX_PCI(vp), dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE); /* 'skb_put()' points to the start of sk_buff data area. */ |