From patchwork Tue Feb 7 18:27:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 139988 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EE340B71A9 for ; Wed, 8 Feb 2012 05:27:42 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755720Ab2BGS1l (ORCPT ); Tue, 7 Feb 2012 13:27:41 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:55816 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751507Ab2BGS1k (ORCPT ); Tue, 7 Feb 2012 13:27:40 -0500 Received: by yenm8 with SMTP id m8so3165531yen.19 for ; Tue, 07 Feb 2012 10:27:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=jl4VycfgxaYIvap/GJgIrbrB+nF7Pda7IDWy57Rhnss=; b=q+Q9Etaqza1nz7IpHVaVV/a+IXY/k8fGkfwTTGjiUXCTATMAiFcUKPsXURbTtPMmh2 uAaPtVhHk3bvyeCY4AZ+X0tYQexc8aLfT5BwndpcTcGWXgBu19PkSqTYmeJynwapy5ui WefLd5hD2kvuEn/ONsLX7h8CpJkiKaoeJPS28= Received: by 10.101.2.7 with SMTP id e7mr10062670ani.33.1328639259704; Tue, 07 Feb 2012 10:27:39 -0800 (PST) Received: from localhost.localdomain ([187.106.61.98]) by mx.google.com with ESMTPS id g49sm29396297yhk.20.2012.02.07.10.27.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Feb 2012 10:27:38 -0800 (PST) From: Fabio Estevam To: netdev@vger.kernel.org Cc: davem@davemloft.net, netdev@pradeepdalvi.com, kernel@pengutronix.de, Fabio Estevam , Fabio Estevam Subject: [PATCH] net: fec: Fix build due to wrong dev annotation Date: Tue, 7 Feb 2012 16:27:31 -0200 Message-Id: <1328639251-26310-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org commit 21a4e469 (netdev: ethernet dev_alloc_skb to netdev_alloc_skb) should have used "ndev" instead of "dev". This causes the following build errors: drivers/net/ethernet/freescale/fec.c: In function 'fec_enet_rx': drivers/net/ethernet/freescale/fec.c:714: error: 'dev' undeclared (first use in this function) drivers/net/ethernet/freescale/fec.c:714: error: (Each undeclared identifier is reported only once drivers/net/ethernet/freescale/fec.c:714: error: for each function it appears in.) drivers/net/ethernet/freescale/fec.c: In function 'fec_enet_alloc_buffers': drivers/net/ethernet/freescale/fec.c:1213: error: 'dev' undeclared (first use in this function) Fix it, so that fec driver can be built again. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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;