Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d266430 authored by Pradeep A Dalvi's avatar Pradeep A Dalvi Committed by David S. Miller
Browse files

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: default avatarPradeep A Dalvi <netdev@pradeepdalvi.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3238a9be

drivers/net/ethernet/3com/3c501.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static void el_receive(struct net_device *dev) 
	 */



	outb(AX_SYS, AX_CMD);

	skb = dev_alloc_skb(pkt_len+2);

	skb = netdev_alloc_skb(dev, pkt_len + 2);



	/*

	 *	Start of frame

drivers/net/ethernet/3com/3c509.c

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,7 @@ el3_rx(struct net_device *dev) 
			short pkt_len = rx_status & 0x7ff;

			struct sk_buff *skb;



			skb = dev_alloc_skb(pkt_len+5);

			skb = netdev_alloc_skb(dev, pkt_len + 5);

			if (el3_debug > 4)

				pr_debug("Receiving packet size %d status %4.4x.\n",

					   pkt_len, rx_status);

drivers/net/ethernet/3com/3c574_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ static int el3_rx(struct net_device *dev, int worklimit) 
			short pkt_len = rx_status & 0x7ff;

			struct sk_buff *skb;



			skb = dev_alloc_skb(pkt_len+5);

			skb = netdev_alloc_skb(dev, pkt_len + 5);



			pr_debug("  Receiving packet size %d status %4.4x.\n",

				  pkt_len, rx_status);

drivers/net/ethernet/3com/3c589_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int el3_rx(struct net_device *dev) 
	    short pkt_len = rx_status & 0x7ff;

	    struct sk_buff *skb;



	    skb = dev_alloc_skb(pkt_len+5);

	    skb = netdev_alloc_skb(dev, pkt_len + 5);



	    netdev_dbg(dev, "    Receiving packet size %d status %4.4x.\n",

		       pkt_len, rx_status);

drivers/net/ethernet/3com/3c59x.c

+3 −2
Original line number Diff line number Diff line
@@ -2499,7 +2499,7 @@ static int vortex_rx(struct net_device *dev) 
			int pkt_len = rx_status & 0x1fff;

			struct sk_buff *skb;



			skb = dev_alloc_skb(pkt_len + 5);

			skb = netdev_alloc_skb(dev, pkt_len + 5);

			if (vortex_debug > 4)

				pr_debug("Receiving packet size %d status %4.4x.\n",

					   pkt_len, rx_status);
@@ -2578,7 +2578,8 @@ boomerang_rx(struct net_device *dev) 


			/* Check if the packet is long enough to just accept without

			   copying to a properly sized skbuff. */

			if (pkt_len < rx_copybreak && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {

			if (pkt_len < rx_copybreak &&

			    (skb = netdev_alloc_skb(dev, pkt_len + 2)) != NULL) {

				skb_reserve(skb, 2);	/* Align IP on 16 byte boundaries */

				pci_dma_sync_single_for_cpu(VORTEX_PCI(vp), dma, PKT_BUF_SZ, PCI_DMA_FROMDEVICE);

				/* 'skb_put()' points to the start of sk_buff data area. */