aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2007-10-17 15:57:46 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-17 20:11:29 -0400
commitdb0e8e3f71dbd9a67e44eaa01d10e468d11fa73e (patch)
treef12352e527ceac09fd77240195b5e30185f5ed4f
parentf860f49ee2e59d1a665416c9155cad7661ee0552 (diff)
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>
-rw-r--r--drivers/net/gianfar.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index cc288d8f6a53..38268d7335a8 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -956,10 +956,12 @@ static int gfar_enet_open(struct net_device *dev)
956 } 956 }
957 957
958 err = startup_gfar(dev); 958 err = startup_gfar(dev);
959 if (err) 959 if (err) {
960#ifdef CONFIG_GFAR_NAPI 960#ifdef CONFIG_GFAR_NAPI
961 napi_disable(&priv->napi); 961 napi_disable(&priv->napi);
962#endif 962#endif
963 return err;
964 }
963 965
964 netif_start_queue(dev); 966 netif_start_queue(dev);
965 967