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>

7 files changed, 17 insertions, 18 deletions

diff --git a/drivers/net/ethernet/dec/ewrk3.c b/drivers/net/ethernet/dec/ewrk3.c
index f9df5e4d034..1879f84a25a 100644
--- a/drivers/net/ethernet/dec/ewrk3.c
+++ b/drivers/net/ethernet/dec/ewrk3.c
@@ -986,8 +986,10 @@ static int ewrk3_rx(struct net_device *dev)
                                                 dev->stats.rx_fifo_errors++;
                                 } else {
                                         struct sk_buff *skb;
+                                        skb = netdev_alloc_skb(dev,
+                                                        pkt_len + 2);
 
-                                        if ((skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                                        if (skb != NULL) {
                                                 unsigned char *p;
                                                 skb_reserve(skb, 2);    /* Align to 16 bytes */
                                                 p = skb_put(skb, pkt_len);
diff --git a/drivers/net/ethernet/dec/tulip/de2104x.c b/drivers/net/ethernet/dec/tulip/de2104x.c
index 1eb46a0bb48..68f1c39184d 100644
--- a/drivers/net/ethernet/dec/tulip/de2104x.c
+++ b/drivers/net/ethernet/dec/tulip/de2104x.c
@@ -439,7 +439,7 @@ static void de_rx (struct de_private *de)
                           rx_tail, status, len, copying_skb);
 
                 buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
-                copy_skb = dev_alloc_skb (buflen);
+                copy_skb = netdev_alloc_skb(de->dev, buflen);
                 if (unlikely(!copy_skb)) {
                         de->net_stats.rx_dropped++;
                         drop = 1;
@@ -1283,12 +1283,10 @@ static int de_refill_rx (struct de_private *de)
         for (i = 0; i < DE_RX_RING_SIZE; i++) {
                 struct sk_buff *skb;
 
-                skb = dev_alloc_skb(de->rx_buf_sz);
+                skb = netdev_alloc_skb(de->dev, de->rx_buf_sz);
                 if (!skb)
                         goto err_out;
 
-                skb->dev = de->dev;
-
                 de->rx_skb[i].mapping = pci_map_single(de->pdev,
                         skb->data, de->rx_buf_sz, PCI_DMA_FROMDEVICE);
                 de->rx_skb[i].skb = skb;
diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index 4d71f5ae20c..93583408a32 100644
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -3598,7 +3598,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)
     struct sk_buff *ret;
     u_long i=0, tmp;
 
-    p = dev_alloc_skb(IEEE802_3_SZ + DE4X5_ALIGN + 2);
+    p = netdev_alloc_skb(dev, IEEE802_3_SZ + DE4X5_ALIGN + 2);
     if (!p) return NULL;
 
     tmp = virt_to_bus(p->data);
@@ -3618,7 +3618,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)
 #else
     if (lp->state != OPEN) return (struct sk_buff *)1; /* Fake out the open */
 
-    p = dev_alloc_skb(len + 2);
+    p = netdev_alloc_skb(dev, len + 2);
     if (!p) return NULL;
 
     skb_reserve(p, 2);                                 /* Align */
diff --git a/drivers/net/ethernet/dec/tulip/interrupt.c b/drivers/net/ethernet/dec/tulip/interrupt.c
index feaee7424bd..28a5e425fec 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)
                         struct sk_buff *skb;
                         dma_addr_t mapping;
 
-                        skb = tp->rx_buffers[entry].skb = dev_alloc_skb(PKT_BUF_SZ);
+                        skb = tp->rx_buffers[entry].skb =
+                                netdev_alloc_skb(dev, PKT_BUF_SZ);
                         if (skb == NULL)
                                 break;
 
@@ -77,7 +78,6 @@ int tulip_refill_rx(struct net_device *dev)
                                                  PCI_DMA_FROMDEVICE);
                         tp->rx_buffers[entry].mapping = mapping;
 
-                        skb->dev = dev;                 /* Mark as being used by this device. */
                         tp->rx_ring[entry].buffer1 = cpu_to_le32(mapping);
                         refilled++;
                 }
@@ -202,7 +202,7 @@ int tulip_poll(struct napi_struct *napi, int budget)
                                /* Check if the packet is long enough to accept without copying
                                   to a minimally-sized skbuff. */
                                if (pkt_len < tulip_rx_copybreak &&
-                                   (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                                   (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                        skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                        pci_dma_sync_single_for_cpu(tp->pdev,
                                                                    tp->rx_buffers[entry].mapping,
@@ -428,7 +428,7 @@ static int tulip_rx(struct net_device *dev)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < tulip_rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(tp->pdev,
                                                             tp->rx_buffers[entry].mapping,
diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c
index 17ecb18341c..fea3641d939 100644
--- a/drivers/net/ethernet/dec/tulip/tulip_core.c
+++ b/drivers/net/ethernet/dec/tulip/tulip_core.c
@@ -636,16 +636,15 @@ static void tulip_init_ring(struct net_device *dev)
                 dma_addr_t mapping;
 
                 /* Note the receive buffer must be longword aligned.
-                   dev_alloc_skb() provides 16 byte alignment.  But do *not*
+                   netdev_alloc_skb() provides 16 byte alignment.  But do *not*
                    use skb_reserve() to align the IP header! */
-                struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
+                struct sk_buff *skb = netdev_alloc_skb(dev, PKT_BUF_SZ);
                 tp->rx_buffers[i].skb = skb;
                 if (skb == NULL)
                         break;
                 mapping = pci_map_single(tp->pdev, skb->data,
                                          PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
                 tp->rx_buffers[i].mapping = mapping;
-                skb->dev = dev;                 /* Mark as being used by this device. */
                 tp->rx_ring[i].status = cpu_to_le32(DescOwned); /* Owned by Tulip chip */
                 tp->rx_ring[i].buffer1 = cpu_to_le32(mapping);
         }
diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
index 52da7b2fe3b..2ac6fff0363 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)
 
         /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(np->rx_buf_sz);
+                struct sk_buff *skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                 np->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
@@ -1231,7 +1231,7 @@ static int netdev_rx(struct net_device *dev)
                         /* Check if the packet is long enough to accept without copying
                            to a minimally-sized skbuff. */
                         if (pkt_len < rx_copybreak &&
-                            (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
+                            (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
                                 pci_dma_sync_single_for_cpu(np->pci_dev,np->rx_addr[entry],
                                                             np->rx_skbuff[entry]->len,
@@ -1270,7 +1270,7 @@ static int netdev_rx(struct net_device *dev)
                 struct sk_buff *skb;
                 entry = np->dirty_rx % RX_RING_SIZE;
                 if (np->rx_skbuff[entry] == NULL) {
-                        skb = dev_alloc_skb(np->rx_buf_sz);
+                        skb = netdev_alloc_skb(dev, np->rx_buf_sz);
                         np->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;                  /* Better luck next round. */
diff --git a/drivers/net/ethernet/dec/tulip/xircom_cb.c b/drivers/net/ethernet/dec/tulip/xircom_cb.c
index b7c73eefb54..fdb329fe6e8 100644
--- a/drivers/net/ethernet/dec/tulip/xircom_cb.c
+++ b/drivers/net/ethernet/dec/tulip/xircom_cb.c
@@ -1084,7 +1084,7 @@ investigate_read_descriptor(struct net_device *dev, struct xircom_private *card,
                         pkt_len = 1518;
                 }
 
-                skb = dev_alloc_skb(pkt_len + 2);
+                skb = netdev_alloc_skb(dev, pkt_len + 2);
                 if (skb == NULL) {
                         dev->stats.rx_dropped++;
                         goto out;