From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from buildserver.ru.mvista.com (unknown [85.21.88.6]) by ozlabs.org (Postfix) with ESMTP id D838FDDEF5 for ; Thu, 18 Oct 2007 05:58:06 +1000 (EST) Date: Wed, 17 Oct 2007 23:57:46 +0400 From: Anton Vorontsov To: leoli@freescale.com, jgarzik@pobox.com, paulus@samba.org Subject: [PATCH][NET] gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement Message-ID: <20071017195746.GA15592@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Erroneous #ifdef introduced by 293c8513398657f6263fcdb03c87f2760cf61be4 causing NAPI-less ethernet malfunctioning. Signed-off-by: Anton Vorontsov Signed-off-by: Vitaly Bordug --- if (...) #if ...; #endif good candidate for checkpatch? drivers/net/gianfar.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index cc288d8..38268d7 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -956,10 +956,12 @@ static int gfar_enet_open(struct net_device *dev) } err = startup_gfar(dev); - if (err) + if (err) { #ifdef CONFIG_GFAR_NAPI napi_disable(&priv->napi); #endif + return err; + } netif_start_queue(dev); -- 1.5.0.6