projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d011a23
)
[CASSINI]: Fix two obvious NAPI bugs.
author
David S. Miller
<davem@davemloft.net>
Fri, 4 Jan 2008 08:23:18 +0000
(
00:23
-0800)
committer
David S. Miller
<davem@davemloft.net>
Fri, 4 Jan 2008 11:55:27 +0000
(
03:55
-0800)
1) close should do napi_disable() not napi_enable
2) remove unused local var 'todo'
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/cassini.c
patch
|
blob
|
history
diff --git
a/drivers/net/cassini.c
b/drivers/net/cassini.c
index 544ab0bb174cfd0b94f971fe3f1dd128fa9fb0df..53237ac0f83a3280fa8f7e38a0ec798757637bed 100644
(file)
--- 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_
en
able(&cp->napi);
+ napi_
dis
able(&cp->napi);
#endif
/* Make sure we don't get distracted by suspend/resume */
mutex_lock(&cp->pm_mutex);