Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761921AbXJQT6X (ORCPT ); Wed, 17 Oct 2007 15:58:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756064AbXJQT6K (ORCPT ); Wed, 17 Oct 2007 15:58:10 -0400 Received: from rtsoft3.corbina.net ([85.21.88.6]:12712 "EHLO buildserver.ru.mvista.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754346AbXJQT6J (ORCPT ); Wed, 17 Oct 2007 15:58:09 -0400 Date: Wed, 17 Oct 2007 23:57:46 +0400 From: Anton Vorontsov To: leoli@freescale.com, jgarzik@pobox.com, paulus@samba.org Cc: galak@kernel.crashing.org, afleming@freescale.com, apw@shadowen.org, linuxppc-dev@ozlabs.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.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 Content-Disposition: inline User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1019 Lines: 42 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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/