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>

14 files changed, 24 insertions, 22 deletions

diff --git a/drivers/net/ethernet/amd/7990.c b/drivers/net/ethernet/amd/7990.c
index 60b35fb5f524..1b046f58d58f 100644
--- a/drivers/net/ethernet/amd/7990.c
+++ b/drivers/net/ethernet/amd/7990.c
@@ -316,7 +316,7 @@ static int lance_rx (struct net_device *dev)
                         if (bits & LE_R1_EOP) dev->stats.rx_errors++;
                 } else {
                         int len = (rd->mblength & 0xfff) - 4;
-                        struct sk_buff *skb = dev_alloc_skb (len+2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 
                         if (!skb) {
                                 printk ("%s: Memory squeeze, deferring packet.\n",
diff --git a/drivers/net/ethernet/amd/a2065.c b/drivers/net/ethernet/amd/a2065.c
index 825e5d4ef4c3..689dfcafc6d4 100644
--- a/drivers/net/ethernet/amd/a2065.c
+++ b/drivers/net/ethernet/amd/a2065.c
@@ -290,7 +290,7 @@ static int lance_rx(struct net_device *dev)
                                 dev->stats.rx_errors++;
                 } else {
                         int len = (rd->mblength & 0xfff) - 4;
-                        struct sk_buff *skb = dev_alloc_skb(len + 2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 
                         if (!skb) {
                                 netdev_warn(dev, "Memory squeeze, deferring packet\n");
diff --git a/drivers/net/ethernet/amd/am79c961a.c b/drivers/net/ethernet/amd/am79c961a.c
index 216ae87b9459..cc7b9e46780c 100644
--- a/drivers/net/ethernet/amd/am79c961a.c
+++ b/drivers/net/ethernet/amd/am79c961a.c
@@ -516,7 +516,7 @@ am79c961_rx(struct net_device *dev, struct dev_priv *priv)
                 }
 
                 len = am_readword(dev, hdraddr + 6);
-                skb = dev_alloc_skb(len + 2);
+                skb = netdev_alloc_skb(dev, len + 2);
 
                 if (skb) {
                         skb_reserve(skb, 2);
diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index b8306a589558..9f62504d0086 100644
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -336,7 +336,8 @@ static int amd8111e_init_ring(struct net_device *dev)
         /* Allocating receive  skbs */
         for (i = 0; i < NUM_RX_BUFFERS; i++) {
 
-                if (!(lp->rx_skbuff[i] = dev_alloc_skb(lp->rx_buff_len))) {
+                lp->rx_skbuff[i] = netdev_alloc_skb(dev, lp->rx_buff_len);
+                if (!lp->rx_skbuff[i]) {
                                 /* Release previos allocated skbs */
                                 for(--i; i >= 0 ;i--)
                                         dev_kfree_skb(lp->rx_skbuff[i]);
@@ -768,7 +769,8 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
                         }
                         if(--rx_pkt_limit < 0)
                                 goto rx_not_empty;
-                        if(!(new_skb = dev_alloc_skb(lp->rx_buff_len))){
+                        new_skb = netdev_alloc_skb(dev, lp->rx_buff_len);
+                        if (!new_skb) {
                                 /* if allocation fail,
                                    ignore that pkt and go to next one */
                                 lp->rx_ring[rx_index].rx_flags &= RESET_RX_FLAGS;
diff --git a/drivers/net/ethernet/amd/ariadne.c b/drivers/net/ethernet/amd/ariadne.c
index eb18e1fe65c8..f4c228e4d76c 100644
--- a/drivers/net/ethernet/amd/ariadne.c
+++ b/drivers/net/ethernet/amd/ariadne.c
@@ -191,7 +191,7 @@ static int ariadne_rx(struct net_device *dev)
                         short pkt_len = swapw(priv->rx_ring[entry]->RMD3);
                         struct sk_buff *skb;
 
-                        skb = dev_alloc_skb(pkt_len + 2);
+                        skb = netdev_alloc_skb(dev, pkt_len + 2);
                         if (skb == NULL) {
                                 netdev_warn(dev, "Memory squeeze, deferring packet\n");
                                 for (i = 0; i < RX_RING_SIZE; i++)
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c
index 15bfa28d6c53..70ed79c46245 100644
--- a/drivers/net/ethernet/amd/atarilance.c
+++ b/drivers/net/ethernet/amd/atarilance.c
@@ -997,7 +997,7 @@ static int lance_rx( struct net_device *dev )
                                 dev->stats.rx_errors++;
                         }
                         else {
-                                skb = dev_alloc_skb( pkt_len+2 );
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL) {
                                         DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
                                                                   dev->name ));
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c
index a81c871aeacf..c1dfdc8b7079 100644
--- a/drivers/net/ethernet/amd/au1000_eth.c
+++ b/drivers/net/ethernet/amd/au1000_eth.c
@@ -725,7 +725,7 @@ static int au1000_rx(struct net_device *dev)
                         /* good frame */
                         frmlen = (status & RX_FRAME_LEN_MASK);
                         frmlen -= 4; /* Remove FCS */
-                        skb = dev_alloc_skb(frmlen + 2);
+                        skb = netdev_alloc_skb(dev, frmlen + 2);
                         if (skb == NULL) {
                                 netdev_err(dev, "Memory squeeze, dropping packet.\n");
                                 dev->stats.rx_dropped++;
diff --git a/drivers/net/ethernet/amd/declance.c b/drivers/net/ethernet/amd/declance.c
index dd82ee2f8d21..7dc508e5c72e 100644
--- a/drivers/net/ethernet/amd/declance.c
+++ b/drivers/net/ethernet/amd/declance.c
@@ -605,7 +605,7 @@ static int lance_rx(struct net_device *dev)
                                 dev->stats.rx_errors++;
                 } else {
                         len = (*rds_ptr(rd, mblength, lp->type) & 0xfff) - 4;
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == 0) {
                                 printk("%s: Memory squeeze, deferring packet.\n",
diff --git a/drivers/net/ethernet/amd/depca.c b/drivers/net/ethernet/amd/depca.c
index 681970c07f22..86dd95766a64 100644
--- a/drivers/net/ethernet/amd/depca.c
+++ b/drivers/net/ethernet/amd/depca.c
@@ -1042,7 +1042,7 @@ static int depca_rx(struct net_device *dev)
                                 short len, pkt_len = readw(&lp->rx_ring[entry].msg_length) - 4;
                                 struct sk_buff *skb;
 
-                                skb = dev_alloc_skb(pkt_len + 2);
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb != NULL) {
                                         unsigned char *buf;
                                         skb_reserve(skb, 2);    /* 16 byte align the IP header */
diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c
index 735c213798b1..013b65108536 100644
--- a/drivers/net/ethernet/amd/ni65.c
+++ b/drivers/net/ethernet/amd/ni65.c
@@ -1089,7 +1089,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)
                         if (skb)
                                 skb_reserve(skb,16);
 #else
-                        struct sk_buff *skb = dev_alloc_skb(len+2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, len + 2);
 #endif
                         if(skb)
                         {
diff --git a/drivers/net/ethernet/amd/nmclan_cs.c b/drivers/net/ethernet/amd/nmclan_cs.c
index 6be0dd67631a..ebdb9e238a8d 100644
--- a/drivers/net/ethernet/amd/nmclan_cs.c
+++ b/drivers/net/ethernet/amd/nmclan_cs.c
@@ -1104,7 +1104,7 @@ static int mace_rx(struct net_device *dev, unsigned char RxCnt)
       pr_debug("    receiving packet size 0x%X rx_status"
             " 0x%X.\n", pkt_len, rx_status);
 
-      skb = dev_alloc_skb(pkt_len+2);
+      skb = netdev_alloc_skb(dev, pkt_len + 2);
 
       if (skb != NULL) {
         skb_reserve(skb, 2);
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index 1bb388f62e5b..86b6d8e4e6cd 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -588,11 +588,11 @@ static void pcnet32_realloc_rx_ring(struct net_device *dev,
         /* now allocate any new buffers needed */
         for (; new < size; new++) {
                 struct sk_buff *rx_skbuff;
-                new_skb_list[new] = dev_alloc_skb(PKT_BUF_SKB);
+                new_skb_list[new] = netdev_alloc_skb(dev, PKT_BUF_SKB);
                 rx_skbuff = new_skb_list[new];
                 if (!rx_skbuff) {
                         /* keep the original lists and buffers */
-                        netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                        netif_err(lp, drv, dev, "%s netdev_alloc_skb failed\n",
                                   __func__);
                         goto free_all_new;
                 }
@@ -909,7 +909,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
         /* Initialize Transmit buffers. */
         size = data_len + 15;
         for (x = 0; x < numbuffs; x++) {
-                skb = dev_alloc_skb(size);
+                skb = netdev_alloc_skb(dev, size);
                 if (!skb) {
                         netif_printk(lp, hw, KERN_DEBUG, dev,
                                      "Cannot allocate skb at line: %d!\n",
@@ -1152,7 +1152,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
         if (pkt_len > rx_copybreak) {
                 struct sk_buff *newskb;
 
-                newskb = dev_alloc_skb(PKT_BUF_SKB);
+                newskb = netdev_alloc_skb(dev, PKT_BUF_SKB);
                 if (newskb) {
                         skb_reserve(newskb, NET_IP_ALIGN);
                         skb = lp->rx_skbuff[entry];
@@ -1172,7 +1172,7 @@ static void pcnet32_rx_entry(struct net_device *dev,
                 } else
                         skb = NULL;
         } else
-                skb = dev_alloc_skb(pkt_len + NET_IP_ALIGN);
+                skb = netdev_alloc_skb(dev, pkt_len + NET_IP_ALIGN);
 
         if (skb == NULL) {
                 netif_err(lp, drv, dev, "Memory squeeze, dropping packet\n");
@@ -2271,11 +2271,11 @@ static int pcnet32_init_ring(struct net_device *dev)
         for (i = 0; i < lp->rx_ring_size; i++) {
                 struct sk_buff *rx_skbuff = lp->rx_skbuff[i];
                 if (rx_skbuff == NULL) {
-                        lp->rx_skbuff[i] = dev_alloc_skb(PKT_BUF_SKB);
+                        lp->rx_skbuff[i] = netdev_alloc_skb(dev, PKT_BUF_SKB);
                         rx_skbuff = lp->rx_skbuff[i];
                         if (!rx_skbuff) {
                                 /* there is not much we can do at this point */
-                                netif_err(lp, drv, dev, "%s dev_alloc_skb failed\n",
+                                netif_err(lp, drv, dev, "%s netdev_alloc_skb failed\n",
                                           __func__);
                                 return -1;
                         }
diff --git a/drivers/net/ethernet/amd/sun3lance.c b/drivers/net/ethernet/amd/sun3lance.c
index 080b71fcc683..74b3891b6483 100644
--- a/drivers/net/ethernet/amd/sun3lance.c
+++ b/drivers/net/ethernet/amd/sun3lance.c
@@ -810,7 +810,7 @@ static int lance_rx( struct net_device *dev )
                                 dev->stats.rx_errors++;
                         }
                         else {
-                                skb = dev_alloc_skb( pkt_len+2 );
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL) {
                                         DPRINTK( 1, ( "%s: Memory squeeze, deferring packet.\n",
                                                       dev->name ));
diff --git a/drivers/net/ethernet/amd/sunlance.c b/drivers/net/ethernet/amd/sunlance.c
index 7ea16d32a5f5..e3fe3504e198 100644
--- a/drivers/net/ethernet/amd/sunlance.c
+++ b/drivers/net/ethernet/amd/sunlance.c
@@ -534,7 +534,7 @@ static void lance_rx_dvma(struct net_device *dev)
                         if (bits & LE_R1_EOP) dev->stats.rx_errors++;
                 } else {
                         len = (rd->mblength & 0xfff) - 4;
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == NULL) {
                                 printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",
@@ -706,7 +706,7 @@ static void lance_rx_pio(struct net_device *dev)
                         if (bits & LE_R1_EOP) dev->stats.rx_errors++;
                 } else {
                         len = (sbus_readw(&rd->mblength) & 0xfff) - 4;
-                        skb = dev_alloc_skb(len + 2);
+                        skb = netdev_alloc_skb(dev, len + 2);
 
                         if (skb == NULL) {
                                 printk(KERN_INFO "%s: Memory squeeze, deferring packet.\n",