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>

2 files changed, 6 insertions, 10 deletions

diff --git a/drivers/net/ethernet/packetengines/hamachi.c b/drivers/net/ethernet/packetengines/hamachi.c
index 3458df3780b8..0d29f5f4b8e4 100644
--- a/drivers/net/ethernet/packetengines/hamachi.c
+++ b/drivers/net/ethernet/packetengines/hamachi.c
@@ -1188,11 +1188,10 @@ static void hamachi_init_ring(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(hmp->rx_buf_sz + 2);
+                struct sk_buff *skb = netdev_alloc_skb(dev, hmp->rx_buf_sz + 2);
                 hmp->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                skb->dev = dev;         /* Mark as being used by this device. */
                 skb_reserve(skb, 2); /* 16 byte align the IP header. */
                 hmp->rx_ring[i].addr = cpu_to_leXX(pci_map_single(hmp->pci_dev,
                         skb->data, hmp->rx_buf_sz, PCI_DMA_FROMDEVICE));
@@ -1488,7 +1487,7 @@ static int hamachi_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) {
 #ifdef RX_CHECKSUM
                                 printk(KERN_ERR "%s: rx_copybreak non-zero "
                                   "not good with RX_CHECKSUM\n", dev->name);
@@ -1591,12 +1590,11 @@ static int hamachi_rx(struct net_device *dev)
                 entry = hmp->dirty_rx % RX_RING_SIZE;
                 desc = &(hmp->rx_ring[entry]);
                 if (hmp->rx_skbuff[entry] == NULL) {
-                        struct sk_buff *skb = dev_alloc_skb(hmp->rx_buf_sz + 2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, hmp->rx_buf_sz + 2);
 
                         hmp->rx_skbuff[entry] = skb;
                         if (skb == NULL)
                                 break;          /* Better luck next round. */
-                        skb->dev = dev;         /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         desc->addr = cpu_to_leXX(pci_map_single(hmp->pci_dev,
                                 skb->data, hmp->rx_buf_sz, PCI_DMA_FROMDEVICE));
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c
index 4a5774271bd4..7757b80ef924 100644
--- a/drivers/net/ethernet/packetengines/yellowfin.c
+++ b/drivers/net/ethernet/packetengines/yellowfin.c
@@ -743,11 +743,10 @@ static int yellowfin_init_ring(struct net_device *dev)
         }
 
         for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = dev_alloc_skb(yp->rx_buf_sz + 2);
+                struct sk_buff *skb = netdev_alloc_skb(dev, yp->rx_buf_sz + 2);
                 yp->rx_skbuff[i] = skb;
                 if (skb == NULL)
                         break;
-                skb->dev = dev;         /* Mark as being used by this device. */
                 skb_reserve(skb, 2);    /* 16 byte align the IP header. */
                 yp->rx_ring[i].addr = cpu_to_le32(pci_map_single(yp->pci_dev,
                         skb->data, yp->rx_buf_sz, PCI_DMA_FROMDEVICE));
@@ -1133,7 +1132,7 @@ static int yellowfin_rx(struct net_device *dev)
                                         PCI_DMA_FROMDEVICE);
                                 yp->rx_skbuff[entry] = NULL;
                         } else {
-                                skb = dev_alloc_skb(pkt_len + 2);
+                                skb = netdev_alloc_skb(dev, pkt_len + 2);
                                 if (skb == NULL)
                                         break;
                                 skb_reserve(skb, 2);    /* 16 byte align the IP header */
@@ -1156,11 +1155,10 @@ static int yellowfin_rx(struct net_device *dev)
         for (; yp->cur_rx - yp->dirty_rx > 0; yp->dirty_rx++) {
                 entry = yp->dirty_rx % RX_RING_SIZE;
                 if (yp->rx_skbuff[entry] == NULL) {
-                        struct sk_buff *skb = dev_alloc_skb(yp->rx_buf_sz + 2);
+                        struct sk_buff *skb = netdev_alloc_skb(dev, yp->rx_buf_sz + 2);
                         if (skb == NULL)
                                 break;                          /* Better luck next round. */
                         yp->rx_skbuff[entry] = skb;
-                        skb->dev = dev; /* Mark as being used by this device. */
                         skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
                         yp->rx_ring[entry].addr = cpu_to_le32(pci_map_single(yp->pci_dev,
                                 skb->data, yp->rx_buf_sz, PCI_DMA_FROMDEVICE));