Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=86216268b9cdad57f9aa540ebf49cbae2f38b583
Commit:     86216268b9cdad57f9aa540ebf49cbae2f38b583
Parent:     d011a231675b240157a3c335dd53e9b849d7d30d
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 4 00:23:18 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Fri Jan 4 03:55:27 2008 -0800

    [CASSINI]: Fix two obvious NAPI bugs.
    
    1) close should do napi_disable() not napi_enable
    2) remove unused local var 'todo'
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/net/cassini.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 544ab0b..53237ac 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -2586,7 +2586,7 @@ static int cas_poll(struct napi_struct *napi, int budget)
 {
        struct cas *cp = container_of(napi, struct cas, napi);
        struct net_device *dev = cp->dev;
-       int i, enable_intr, todo, credits;
+       int i, enable_intr, credits;
        u32 status = readl(cp->regs + REG_INTR_STATUS);
        unsigned long flags;
 
@@ -4350,7 +4350,7 @@ static int cas_close(struct net_device *dev)
        struct cas *cp = netdev_priv(dev);
 
 #ifdef USE_NAPI
-       napi_enable(&cp->napi);
+       napi_disable(&cp->napi);
 #endif
        /* Make sure we don't get distracted by suspend/resume */
        mutex_lock(&cp->pm_mutex);
-
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