From mboxrd@z Thu Jan 1 00:00:00 1970 From: marek.vasut@gmail.com (Marek Vasut) Date: Tue, 7 Feb 2012 23:44:03 +0100 Subject: [PATCH RESEND] FEC: Rename dev to ndev, fix compile error Message-ID: <1328654643-28442-1-git-send-email-marek.vasut@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The following commit introduced a typo, this commit fixes it. commit 21a4e46995fa1a76281ac0281ff837f706231a37 Author: Pradeep A Dalvi 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 Cc: Pradeep A Dalvi Cc: David S. Miller --- drivers/net/ethernet/freescale/fec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) RESEND: Typo in list address 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; -- 1.7.8.3