From: David S. Miller <davem@davemloft.net>
Date: Fri, 4 Jan 2008 08:23:18 +0000 (-0800)
Subject: [CASSINI]: Fix two obvious NAPI bugs.
X-Git-Tag: v2.6.24-rc7~6^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86216268b9cdad57f9aa540ebf49cbae2f38b583;p=platform%2Fkernel%2Flinux-3.10.git

[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 <davem@davemloft.net>
---

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);