]> err.no Git - linux-2.6/commitdiff
gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Wed, 17 Oct 2007 19:57:46 +0000 (23:57 +0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 18 Oct 2007 00:11:29 +0000 (20:11 -0400)
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>
drivers/net/gianfar.c

index cc288d8f6a53cc936882c49c19920cc4590ba1c2..38268d7335a8803914a2adb9c59b84a5a9246e5f 100644 (file)
@@ -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);