summaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2007-10-17 21:57:46 +0200
committerJeff Garzik <jeff@garzik.org>2007-10-18 02:11:29 +0200
commitdb0e8e3f71dbd9a67e44eaa01d10e468d11fa73e (patch)
treef12352e527ceac09fd77240195b5e30185f5ed4f /drivers/net/gianfar.c
parentfs_enet: Update for API changes (diff)
downloadlinux-db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e.tar.xz
linux-db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e.zip
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>
Diffstat (limited to 'drivers/net/gianfar.c')
-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)
}
err = startup_gfar(dev);
- if (err)
+ if (err) {
#ifdef CONFIG_GFAR_NAPI
napi_disable(&priv->napi);
#endif
+ return err;
+ }
netif_start_queue(dev);