diff options
Diffstat (limited to 'drivers/net/ethernet/nvidia/forcedeth.c')
-rw-r--r-- | drivers/net/ethernet/nvidia/forcedeth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 4c4e7f458383..5eeb92f87380 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c | |||
@@ -1815,7 +1815,7 @@ static int nv_alloc_rx(struct net_device *dev) | |||
1815 | less_rx = np->last_rx.orig; | 1815 | less_rx = np->last_rx.orig; |
1816 | 1816 | ||
1817 | while (np->put_rx.orig != less_rx) { | 1817 | while (np->put_rx.orig != less_rx) { |
1818 | struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz + NV_RX_ALLOC_PAD); | 1818 | struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz + NV_RX_ALLOC_PAD); |
1819 | if (skb) { | 1819 | if (skb) { |
1820 | np->put_rx_ctx->skb = skb; | 1820 | np->put_rx_ctx->skb = skb; |
1821 | np->put_rx_ctx->dma = pci_map_single(np->pci_dev, | 1821 | np->put_rx_ctx->dma = pci_map_single(np->pci_dev, |
@@ -1850,7 +1850,7 @@ static int nv_alloc_rx_optimized(struct net_device *dev) | |||
1850 | less_rx = np->last_rx.ex; | 1850 | less_rx = np->last_rx.ex; |
1851 | 1851 | ||
1852 | while (np->put_rx.ex != less_rx) { | 1852 | while (np->put_rx.ex != less_rx) { |
1853 | struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz + NV_RX_ALLOC_PAD); | 1853 | struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz + NV_RX_ALLOC_PAD); |
1854 | if (skb) { | 1854 | if (skb) { |
1855 | np->put_rx_ctx->skb = skb; | 1855 | np->put_rx_ctx->skb = skb; |
1856 | np->put_rx_ctx->dma = pci_map_single(np->pci_dev, | 1856 | np->put_rx_ctx->dma = pci_map_single(np->pci_dev, |
@@ -4993,9 +4993,9 @@ static int nv_loopback_test(struct net_device *dev) | |||
4993 | 4993 | ||
4994 | /* setup packet for tx */ | 4994 | /* setup packet for tx */ |
4995 | pkt_len = ETH_DATA_LEN; | 4995 | pkt_len = ETH_DATA_LEN; |
4996 | tx_skb = dev_alloc_skb(pkt_len); | 4996 | tx_skb = netdev_alloc_skb(dev, pkt_len); |
4997 | if (!tx_skb) { | 4997 | if (!tx_skb) { |
4998 | netdev_err(dev, "dev_alloc_skb() failed during loopback test\n"); | 4998 | netdev_err(dev, "netdev_alloc_skb() failed during loopback test\n"); |
4999 | ret = 0; | 4999 | ret = 0; |
5000 | goto out; | 5000 | goto out; |
5001 | } | 5001 | } |