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

Commit 21a4e469 authored Feb 05, 2012 by Pradeep A Dalvi Committed by David S. Miller Feb 06, 2012

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>

parent 1d266430

drivers/net/ethernet/cadence/macb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -397,7 +397,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
	netdev_dbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",		netdev_dbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",
	first_frag, last_frag, len);		first_frag, last_frag, len);

	skb = dev_alloc_skb(len + RX_OFFSET);		skb = netdev_alloc_skb(bp->dev, len + RX_OFFSET);
	if (!skb) {		if (!skb) {
	bp->stats.rx_dropped++;		bp->stats.rx_dropped++;
	for (frag = first_frag; ; frag = NEXT_RX(frag)) {		for (frag = first_frag; ; frag = NEXT_RX(frag)) {

drivers/net/ethernet/cirrus/cs89x0.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -911,7 +911,7 @@ dma_rx(struct net_device *dev)
	}		}

	/* Malloc up new buffer. */		/* Malloc up new buffer. */
	skb = dev_alloc_skb(length + 2);		skb = netdev_alloc_skb(dev, length + 2);
	if (skb == NULL) {		if (skb == NULL) {
	if (net_debug) /* I don't think we want to do this to a stressed system */		if (net_debug) /* I don't think we want to do this to a stressed system */
	printk("%s: Memory squeeze, dropping packet.\n", dev->name);		printk("%s: Memory squeeze, dropping packet.\n", dev->name);
	@@ -1616,7 +1616,7 @@ net_rx(struct net_device *dev)
	}		}

	/* Malloc up new buffer. */		/* Malloc up new buffer. */
	skb = dev_alloc_skb(length + 2);		skb = netdev_alloc_skb(dev, length + 2);
	if (skb == NULL) {		if (skb == NULL) {
	#if 0 /* Again, this seems a cruel thing to do */		#if 0 /* Again, this seems a cruel thing to do */
	printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);		printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);

drivers/net/ethernet/cirrus/ep93xx_eth.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -282,7 +282,7 @@ static int ep93xx_rx(struct net_device *dev, int processed, int budget)
	if (rstat0 & RSTAT0_CRCI)		if (rstat0 & RSTAT0_CRCI)
	length -= 4;		length -= 4;

	skb = dev_alloc_skb(length + 2);		skb = netdev_alloc_skb(dev, length + 2);
	if (likely(skb != NULL)) {		if (likely(skb != NULL)) {
	struct ep93xx_rdesc *rxd = &ep->descs->rdesc[entry];		struct ep93xx_rdesc *rxd = &ep->descs->rdesc[entry];
	skb_reserve(skb, 2);		skb_reserve(skb, 2);

drivers/net/ethernet/davicom/dm9000.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1028,7 +1028,7 @@ dm9000_rx(struct net_device *dev)

	/* Move data from DM9000 */		/* Move data from DM9000 */
	if (GoodPacket &&		if (GoodPacket &&
	((skb = dev_alloc_skb(RxLen + 4)) != NULL)) {		((skb = netdev_alloc_skb(dev, RxLen + 4)) != NULL)) {
	skb_reserve(skb, 2);		skb_reserve(skb, 2);
	rdptr = (u8 *) skb_put(skb, RxLen - 4);		rdptr = (u8 *) skb_put(skb, RxLen - 4);

drivers/net/ethernet/dec/ewrk3.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -986,8 +986,10 @@ static int ewrk3_rx(struct net_device *dev)
	dev->stats.rx_fifo_errors++;		dev->stats.rx_fifo_errors++;
	} else {		} else {
	struct sk_buff *skb;		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;		unsigned char *p;
	skb_reserve(skb, 2); /* Align to 16 bytes */		skb_reserve(skb, 2); /* Align to 16 bytes */
	p = skb_put(skb, pkt_len);		p = skb_put(skb, pkt_len);