diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2007-10-17 23:57:46 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-17 20:11:29 -0400 |
| commit | db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e (patch) | |
| tree | f12352e527ceac09fd77240195b5e30185f5ed4f /drivers/net | |
| parent | f860f49ee2e59d1a665416c9155cad7661ee0552 (diff) | |
| download | op-kernel-dev-db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e.zip op-kernel-dev-db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e.tar.gz | |
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')
| -rw-r--r-- | 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); |
