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>

12 files changed, 15 insertions, 17 deletions

diff --git a/drivers/net/ethernet/i825xx/3c505.c b/drivers/net/ethernet/i825xx/3c505.c
index ba82a266051d..6a5c21b82c51 100644
--- a/drivers/net/ethernet/i825xx/3c505.c
+++ b/drivers/net/ethernet/i825xx/3c505.c
@@ -583,7 +583,7 @@ static void receive_packet(struct net_device *dev, int len)
         unsigned long flags;
 
         rlen = (len + 1) & ~1;
-        skb = dev_alloc_skb(rlen + 2);
+        skb = netdev_alloc_skb(dev, rlen + 2);
 
         if (!skb) {
                 pr_warning("%s: memory squeeze, dropping packet\n", dev->name);
diff --git a/drivers/net/ethernet/i825xx/3c507.c b/drivers/net/ethernet/i825xx/3c507.c
index 1e945551c144..ed6925f11479 100644
--- a/drivers/net/ethernet/i825xx/3c507.c
+++ b/drivers/net/ethernet/i825xx/3c507.c
@@ -851,7 +851,7 @@ static void el16_rx(struct net_device *dev)
                         struct sk_buff *skb;
 
                         pkt_len &= 0x3fff;
-                        skb = dev_alloc_skb(pkt_len+2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) {
                                 pr_err("%s: Memory squeeze, dropping packet.\n",
                                        dev->name);
diff --git a/drivers/net/ethernet/i825xx/3c523.c b/drivers/net/ethernet/i825xx/3c523.c
index d70d3df4c985..8451ecd4c1ec 100644
--- a/drivers/net/ethernet/i825xx/3c523.c
+++ b/drivers/net/ethernet/i825xx/3c523.c
@@ -983,7 +983,7 @@ static void elmc_rcv_int(struct net_device *dev)
                         if ((totlen = rbd->status) & RBD_LAST) {        /* the first and the last buffer? */
                                 totlen &= RBD_MASK;     /* length of this frame */
                                 rbd->status = 0;
-                                skb = (struct sk_buff *) dev_alloc_skb(totlen + 2);
+                                skb = netdev_alloc_skb(dev, totlen + 2);
                                 if (skb != NULL) {
                                         skb_reserve(skb, 2);    /* 16 byte alignment */
                                         skb_put(skb,totlen);
diff --git a/drivers/net/ethernet/i825xx/3c527.c b/drivers/net/ethernet/i825xx/3c527.c
index 474b5e71a53a..ef43f3e951c5 100644
--- a/drivers/net/ethernet/i825xx/3c527.c
+++ b/drivers/net/ethernet/i825xx/3c527.c
@@ -1169,7 +1169,7 @@ static void mc32_rx_ring(struct net_device *dev)
                         /* Try to save time by avoiding a copy on big frames */
 
                         if ((length > RX_COPYBREAK) &&
-                            ((newskb=dev_alloc_skb(1532)) != NULL))
+                            ((newskb = netdev_alloc_skb(dev, 1532)) != NULL))
                         {
                                 skb=lp->rx_ring[rx_ring_tail].skb;
                                 skb_put(skb, length);
@@ -1180,7 +1180,7 @@ static void mc32_rx_ring(struct net_device *dev)
                         }
                         else
                         {
-                                skb=dev_alloc_skb(length+2);
+                                skb = netdev_alloc_skb(dev, length + 2);
 
                                 if(skb==NULL) {
                                         dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/i825xx/82596.c b/drivers/net/ethernet/i825xx/82596.c
index f2408a4d5d9c..6aa927af382c 100644
--- a/drivers/net/ethernet/i825xx/82596.c
+++ b/drivers/net/ethernet/i825xx/82596.c
@@ -549,14 +549,13 @@ static inline int init_rx_bufs(struct net_device *dev)
         /* First build the Receive Buffer Descriptor List */
 
         for (i = 0, rbd = lp->rbds; i < rx_ring_size; i++, rbd++) {
-                struct sk_buff *skb = dev_alloc_skb(PKT_BUF_SZ);
+                struct sk_buff *skb = netdev_alloc_skb(dev, PKT_BUF_SZ);
 
                 if (skb == NULL) {
                         remove_rx_bufs(dev);
                         return -ENOMEM;
                 }
 
-                skb->dev = dev;
                 rbd->v_next = rbd+1;
                 rbd->b_next = WSWAPrbd(virt_to_bus(rbd+1));
                 rbd->b_addr = WSWAPrbd(virt_to_bus(rbd));
@@ -810,7 +809,7 @@ static inline int i596_rx(struct net_device *dev)
                                 struct sk_buff *newskb;
 
                                 /* Get fresh skbuff to replace filled one. */
-                                newskb = dev_alloc_skb(PKT_BUF_SZ);
+                                newskb = netdev_alloc_skb(dev, PKT_BUF_SZ);
                                 if (newskb == NULL) {
                                         skb = NULL;     /* drop pkt */
                                         goto memory_squeeze;
@@ -819,7 +818,6 @@ static inline int i596_rx(struct net_device *dev)
                                 skb_put(skb, pkt_len);
                                 rx_in_place = 1;
                                 rbd->skb = newskb;
-                                newskb->dev = dev;
                                 rbd->v_data = newskb->data;
                                 rbd->b_data = WSWAPchar(virt_to_bus(newskb->data));
 #ifdef __mc68000__
@@ -827,7 +825,7 @@ static inline int i596_rx(struct net_device *dev)
 #endif
                         }
                         else
-                                skb = dev_alloc_skb(pkt_len + 2);
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
 memory_squeeze:
                         if (skb == NULL) {
                                 /* XXX tulip.c can defer packets here!! */
diff --git a/drivers/net/ethernet/i825xx/eepro.c b/drivers/net/ethernet/i825xx/eepro.c
index 114cda7721fe..7a4ad4a07917 100644
--- a/drivers/net/ethernet/i825xx/eepro.c
+++ b/drivers/net/ethernet/i825xx/eepro.c
@@ -1563,7 +1563,7 @@ eepro_rx(struct net_device *dev)
 
                         dev->stats.rx_bytes+=rcv_size;
                         rcv_size &= 0x3fff;
-                        skb = dev_alloc_skb(rcv_size+5);
+                        skb = netdev_alloc_skb(dev, rcv_size + 5);
                         if (skb == NULL) {
                                 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", dev->name);
                                 dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/i825xx/eexpress.c b/drivers/net/ethernet/i825xx/eexpress.c
index 3a9580f3d4dd..3fc649e54a32 100644
--- a/drivers/net/ethernet/i825xx/eexpress.c
+++ b/drivers/net/ethernet/i825xx/eexpress.c
@@ -955,7 +955,7 @@ static void eexp_hw_rx_pio(struct net_device *dev)
                         {
                                 struct sk_buff *skb;
                                 pkt_len &= 0x3fff;
-                                skb = dev_alloc_skb(pkt_len+16);
+                                skb = netdev_alloc_skb(dev, pkt_len + 16);
                                 if (skb == NULL)
                                 {
                                         printk(KERN_WARNING "%s: Memory squeeze, dropping packet\n",dev->name);
diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c
index 42e90a97c7a5..406a12b46404 100644
--- a/drivers/net/ethernet/i825xx/ether1.c
+++ b/drivers/net/ethernet/i825xx/ether1.c
@@ -867,7 +867,7 @@ ether1_recv_done (struct net_device *dev)
                         struct sk_buff *skb;
 
                         length = (length + 1) & ~1;
-                        skb = dev_alloc_skb (length + 2);
+                        skb = netdev_alloc_skb(dev, length + 2);
 
                         if (skb) {
                                 skb_reserve (skb, 2);
diff --git a/drivers/net/ethernet/i825xx/lp486e.c b/drivers/net/ethernet/i825xx/lp486e.c
index 02df5f5accb1..6c2952c8ea15 100644
--- a/drivers/net/ethernet/i825xx/lp486e.c
+++ b/drivers/net/ethernet/i825xx/lp486e.c
@@ -656,7 +656,7 @@ i596_rx_one(struct net_device *dev, struct i596_private *lp,
         if (rfd->stat & RFD_STAT_OK) {
                 /* a good frame */
                 int pkt_len = (rfd->count & 0x3fff);
-                struct sk_buff *skb = dev_alloc_skb(pkt_len);
+                struct sk_buff *skb = netdev_alloc_skb(dev, pkt_len);
 
                 (*frames)++;
 
diff --git a/drivers/net/ethernet/i825xx/ni52.c b/drivers/net/ethernet/i825xx/ni52.c
index c0893715ef47..272976e1bb0f 100644
--- a/drivers/net/ethernet/i825xx/ni52.c
+++ b/drivers/net/ethernet/i825xx/ni52.c
@@ -964,7 +964,7 @@ static void ni52_rcv_int(struct net_device *dev)
                                 /* the first and the last buffer? */
                                 totlen &= RBD_MASK; /* length of this frame */
                                 writew(0x00, &rbd->status);
-                                skb = (struct sk_buff *)dev_alloc_skb(totlen+2);
+                                skb = netdev_alloc_skb(dev, totlen + 2);
                                 if (skb != NULL) {
                                         skb_reserve(skb, 2);
                                         skb_put(skb, totlen);
diff --git a/drivers/net/ethernet/i825xx/sun3_82586.c b/drivers/net/ethernet/i825xx/sun3_82586.c
index 296cf8a0ee51..cae17f4bc93e 100644
--- a/drivers/net/ethernet/i825xx/sun3_82586.c
+++ b/drivers/net/ethernet/i825xx/sun3_82586.c
@@ -778,7 +778,7 @@ static void sun3_82586_rcv_int(struct net_device *dev)
                                 {
                                         totlen &= RBD_MASK; /* length of this frame */
                                         rbd->status = 0;
-                                        skb = (struct sk_buff *) dev_alloc_skb(totlen+2);
+                                        skb = netdev_alloc_skb(dev, totlen + 2);
                                         if(skb != NULL)
                                         {
                                                 skb_reserve(skb,2);
diff --git a/drivers/net/ethernet/i825xx/znet.c b/drivers/net/ethernet/i825xx/znet.c
index 962b4c421f3f..a43649735a04 100644
--- a/drivers/net/ethernet/i825xx/znet.c
+++ b/drivers/net/ethernet/i825xx/znet.c
@@ -762,7 +762,7 @@ static void znet_rx(struct net_device *dev)
                         /* Malloc up new buffer. */
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len);
+                        skb = netdev_alloc_skb(dev, pkt_len);
                         if (skb == NULL) {
                                 if (znet_debug)
                                   printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);