diff options
author | David S. Miller <davem@davemloft.net> | 2008-01-04 03:23:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-04 06:55:27 -0500 |
commit | 86216268b9cdad57f9aa540ebf49cbae2f38b583 (patch) | |
tree | 48b70751c21edee5f7232efaef82b561306a014c /drivers/net | |
parent | d011a231675b240157a3c335dd53e9b849d7d30d (diff) |
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | 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 544ab0bb174c..53237ac0f83a 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) | |||
2586 | { | 2586 | { |
2587 | struct cas *cp = container_of(napi, struct cas, napi); | 2587 | struct cas *cp = container_of(napi, struct cas, napi); |
2588 | struct net_device *dev = cp->dev; | 2588 | struct net_device *dev = cp->dev; |
2589 | int i, enable_intr, todo, credits; | 2589 | int i, enable_intr, credits; |
2590 | u32 status = readl(cp->regs + REG_INTR_STATUS); | 2590 | u32 status = readl(cp->regs + REG_INTR_STATUS); |
2591 | unsigned long flags; | 2591 | unsigned long flags; |
2592 | 2592 | ||
@@ -4350,7 +4350,7 @@ static int cas_close(struct net_device *dev) | |||
4350 | struct cas *cp = netdev_priv(dev); | 4350 | struct cas *cp = netdev_priv(dev); |
4351 | 4351 | ||
4352 | #ifdef USE_NAPI | 4352 | #ifdef USE_NAPI |
4353 | napi_enable(&cp->napi); | 4353 | napi_disable(&cp->napi); |
4354 | #endif | 4354 | #endif |
4355 | /* Make sure we don't get distracted by suspend/resume */ | 4355 | /* Make sure we don't get distracted by suspend/resume */ |
4356 | mutex_lock(&cp->pm_mutex); | 4356 | mutex_lock(&cp->pm_mutex); |