Patchwork FEC: Rename dev to ndev, fix compile error

login
register
mail settings
Submitter Marek Vasut
Date Feb. 7, 2012, 10:42 p.m.
Message ID <1328654548-28396-1-git-send-email-marek.vasut@gmail.com>
Download mbox | patch
Permalink /patch/140027/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Marek Vasut - Feb. 7, 2012, 10:42 p.m.
The following commit introduced a typo, this commit fixes it.

commit 21a4e46995fa1a76281ac0281ff837f706231a37
Author: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Date:   Sun Feb 5 02:50:10 2012 +0000

    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: Marek Vasut <marek.vasut@gmail.com>
Cc: Pradeep A Dalvi <netdev@pradeepdalvi.com>
Cc: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/freescale/fec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
David Miller - Feb. 8, 2012, 12:04 a.m.
From: Marek Vasut <marek.vasut@gmail.com>
Date: Tue,  7 Feb 2012 23:42:28 +0100

> The following commit introduced a typo, this commit fixes it.
> 
> commit 21a4e46995fa1a76281ac0281ff837f706231a37
> Author: Pradeep A Dalvi <netdev@pradeepdalvi.com>
> Date:   Sun Feb 5 02:50:10 2012 +0000
> 
>     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: Marek Vasut <marek.vasut@gmail.com>

This is already fixed in the net-next tree.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Marek Vasut - Feb. 8, 2012, 12:09 a.m.
> From: Marek Vasut <marek.vasut@gmail.com>
> Date: Tue,  7 Feb 2012 23:42:28 +0100
> 
> > The following commit introduced a typo, this commit fixes it.
> > 
> > commit 21a4e46995fa1a76281ac0281ff837f706231a37
> > Author: Pradeep A Dalvi <netdev@pradeepdalvi.com>
> > Date:   Sun Feb 5 02:50:10 2012 +0000
> > 
> >     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: Marek Vasut <marek.vasut@gmail.com>
> 
> This is already fixed in the net-next tree.

Right, it wasn't in -next so I sent it. Thanks

M
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index f976619..0ee2ca7 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -711,7 +711,7 @@  fec_enet_rx(struct net_device *ndev)
 		 * include that when passing upstream as it messes up
 		 * bridging applications.
 		 */
-		skb = netdev_alloc_skb(dev, pkt_len - 4 + NET_IP_ALIGN);
+		skb = netdev_alloc_skb(ndev, pkt_len - 4 + NET_IP_ALIGN);
 
 		if (unlikely(!skb)) {
 			printk("%s: Memory squeeze, dropping packet.\n",
@@ -1210,7 +1210,7 @@  static int fec_enet_alloc_buffers(struct net_device *ndev)
 
 	bdp = fep->rx_bd_base;
 	for (i = 0; i < RX_RING_SIZE; i++) {
-		skb = netdev_alloc_skb(dev, FEC_ENET_RX_FRSIZE);
+		skb = netdev_alloc_skb(ndev, FEC_ENET_RX_FRSIZE);
 		if (!skb) {
 			fec_enet_free_buffers(ndev);
 			return -ENOMEM;