diff options
author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-04 21:50:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:52:27 -0500 |
commit | c056b734e54e12f38f34a2583a4824e6cecc16c1 (patch) | |
tree | 78e501091b9f99477e9b919c03fd5b1930a46198 /drivers/net/ethernet/marvell | |
parent | 21a4e46995fa1a76281ac0281ff837f706231a37 (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/marvell')
-rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 9edecfa1f0f4..f702d0dc18c7 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
@@ -667,7 +667,7 @@ static int rxq_refill(struct rx_queue *rxq, int budget) | |||
667 | 667 | ||
668 | skb = __skb_dequeue(&mp->rx_recycle); | 668 | skb = __skb_dequeue(&mp->rx_recycle); |
669 | if (skb == NULL) | 669 | if (skb == NULL) |
670 | skb = dev_alloc_skb(mp->skb_size); | 670 | skb = netdev_alloc_skb(mp->dev, mp->skb_size); |
671 | 671 | ||
672 | if (skb == NULL) { | 672 | if (skb == NULL) { |
673 | mp->oom = 1; | 673 | mp->oom = 1; |
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 92b4b4e68e3b..75df2091bd2e 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c | |||
@@ -350,7 +350,7 @@ static void rxq_refill(struct net_device *dev) | |||
350 | while (pep->rx_desc_count < pep->rx_ring_size) { | 350 | while (pep->rx_desc_count < pep->rx_ring_size) { |
351 | int size; | 351 | int size; |
352 | 352 | ||
353 | skb = dev_alloc_skb(pep->skb_size); | 353 | skb = netdev_alloc_skb(dev, pep->skb_size); |
354 | if (!skb) | 354 | if (!skb) |
355 | break; | 355 | break; |
356 | if (SKB_DMA_REALIGN) | 356 | if (SKB_DMA_REALIGN) |