Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e
Commit:     db0e8e3f71dbd9a67e44eaa01d10e468d11fa73e
Parent:     f860f49ee2e59d1a665416c9155cad7661ee0552
Author:     Anton Vorontsov <[EMAIL PROTECTED]>
AuthorDate: Wed Oct 17 23:57:46 2007 +0400
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 20:11:29 2007 -0400

    gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placement
    
    Erroneous #ifdef introduced by 293c8513398657f6263fcdb03c87f2760cf61be4
    causing NAPI-less ethernet malfunctioning.
    
    Signed-off-by: Anton Vorontsov <[EMAIL PROTECTED]>
    Signed-off-by: Vitaly Bordug <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to