aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/dec/tulip/interrupt.c
diff options
context:
space:
mode:
authorPradeep A Dalvi <netdev@pradeepdalvi.com>2012-02-04 21:50:10 -0500
committerDavid S. Miller <davem@davemloft.net>2012-02-06 11:48:09 -0500
commit21a4e46995fa1a76281ac0281ff837f706231a37 (patch)
tree3e57d5f21bbc8ec7e625f05e548957f0b4e54013 /drivers/net/ethernet/dec/tulip/interrupt.c
parent1d266430546acf01438ae42d0a7370db4817e2ad (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/interrupt.c')
-rw-r--r--drivers/net/ethernet/dec/tulip/interrupt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/dec/tulip/interrupt.c b/drivers/net/ethernet/dec/tulip/interrupt.c
index feaee7424bd9..28a5e425fecf 100644
--- a/drivers/net/ethernet/dec/tulip/interrupt.c
+++ b/drivers/net/ethernet/dec/tulip/interrupt.c
@@ -69,7 +69,8 @@ int tulip_refill_rx(struct net_device *dev)
69 struct sk_buff *skb; 69 struct sk_buff *skb;
70 dma_addr_t mapping; 70 dma_addr_t mapping;
71 71
72 skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ); 72 skb = tp->rx_buffers[entry].skb =
73 netdev_alloc_skb(dev, PKT_BUF_SZ);
73 if (skb == NULL) 74 if (skb == NULL)
74 break; 75 break;
75 76
@@ -77,7 +78,6 @@ int tulip_refill_rx(struct net_device *dev)
77 PCI_DMA_FROMDEVICE); 78 PCI_DMA_FROMDEVICE);
78 tp->rx_buffers[entry].mapping = mapping; 79 tp->rx_buffers[entry].mapping = mapping;
79 80
80 skb->dev = dev; /* Mark as being used by this device. */
81 tp->rx_ring[entry].buffer1 = cpu_to_le32(mapping); 81 tp->rx_ring[entry].buffer1 = cpu_to_le32(mapping);
82 refilled++; 82 refilled++;
83 } 83 }
@@ -202,7 +202,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
202 /* Check if the packet is long enough to accept without copying 202 /* Check if the packet is long enough to accept without copying
203 to a minimally-sized skbuff. */ 203 to a minimally-sized skbuff. */
204 if (pkt_len < tulip_rx_copybreak && 204 if (pkt_len < tulip_rx_copybreak &&
205 (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { 205 (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
206 skb_reserve(skb, 2); /* 16 byte align the IP header */ 206 skb_reserve(skb, 2); /* 16 byte align the IP header */
207 pci_dma_sync_single_for_cpu(tp->pdev, 207 pci_dma_sync_single_for_cpu(tp->pdev,
208 tp->rx_buffers[entry].mapping, 208 tp->rx_buffers[entry].mapping,
@@ -428,7 +428,7 @@ static int tulip_rx(struct net_device *dev)
428 /* Check if the packet is long enough to accept without copying 428 /* Check if the packet is long enough to accept without copying
429 to a minimally-sized skbuff. */ 429 to a minimally-sized skbuff. */
430 if (pkt_len < tulip_rx_copybreak && 430 if (pkt_len < tulip_rx_copybreak &&
431 (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { 431 (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
432 skb_reserve(skb, 2); /* 16 byte align the IP header */ 432 skb_reserve(skb, 2); /* 16 byte align the IP header */
433 pci_dma_sync_single_for_cpu(tp->pdev, 433 pci_dma_sync_single_for_cpu(tp->pdev,
434 tp->rx_buffers[entry].mapping, 434 tp->rx_buffers[entry].mapping,