diff options
author | Pradeep A Dalvi <netdev@pradeepdalvi.com> | 2012-02-04 21:50:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-06 11:48:09 -0500 |
commit | 21a4e46995fa1a76281ac0281ff837f706231a37 (patch) | |
tree | 3e57d5f21bbc8ec7e625f05e548957f0b4e54013 /drivers/net/ethernet/dec/tulip/winbond-840.c | |
parent | 1d266430546acf01438ae42d0a7370db4817e2ad (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/dec/tulip/winbond-840.c')
-rw-r--r-- | drivers/net/ethernet/dec/tulip/winbond-840.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c index 52da7b2fe3b6..2ac6fff0363a 100644 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c | |||
@@ -815,7 +815,7 @@ static void init_rxtx_rings(struct net_device *dev) | |||
815 | 815 | ||
816 | /* Fill in the Rx buffers. Handle allocation failure gracefully. */ | 816 | /* Fill in the Rx buffers. Handle allocation failure gracefully. */ |
817 | for (i = 0; i < RX_RING_SIZE; i++) { | 817 | for (i = 0; i < RX_RING_SIZE; i++) { |
818 | struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz); | 818 | struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz); |
819 | np->rx_skbuff[i] = skb; | 819 | np->rx_skbuff[i] = skb; |
820 | if (skb == NULL) | 820 | if (skb == NULL) |
821 | break; | 821 | break; |
@@ -1231,7 +1231,7 @@ static int netdev_rx(struct net_device *dev) | |||
1231 | /* Check if the packet is long enough to accept without copying | 1231 | /* Check if the packet is long enough to accept without copying |
1232 | to a minimally-sized skbuff. */ | 1232 | to a minimally-sized skbuff. */ |
1233 | if (pkt_len < rx_copybreak && | 1233 | if (pkt_len < rx_copybreak && |
1234 | (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 1234 | (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) { |
1235 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1235 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
1236 | pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry], | 1236 | pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry], |
1237 | np->rx_skbuff[entry]->len, | 1237 | np->rx_skbuff[entry]->len, |
@@ -1270,7 +1270,7 @@ static int netdev_rx(struct net_device *dev) | |||
1270 | struct sk_buff *skb; | 1270 | struct sk_buff *skb; |
1271 | entry = np->dirty_rx % RX_RING_SIZE; | 1271 | entry = np->dirty_rx % RX_RING_SIZE; |
1272 | if (np->rx_skbuff[entry] == NULL) { | 1272 | if (np->rx_skbuff[entry] == NULL) { |
1273 | skb = dev_alloc_skb(np->rx_buf_sz); | 1273 | skb = netdev_alloc_skb(dev, np->rx_buf_sz); |
1274 | np->rx_skbuff[entry] = skb; | 1274 | np->rx_skbuff[entry] = skb; |
1275 | if (skb == NULL) | 1275 | if (skb == NULL) |
1276 | break; /* Better luck next round. */ | 1276 | break; /* Better luck next round. */ |