From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed, 17 Oct 2007 19:57:46 +0000 (+0400)
Subject: gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
X-Git-Tag: v2.6.24-rc1~286^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e;p=linux-2.6

gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement

Erroneous #ifdef introduced by 293c8513398657f6263fcdb03c87f2760cf61be4
causing NAPI-less ethernet malfunctioning.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index cc288d8f6a..38268d7335 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);