tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

David S. Miller 86216268 d011a231

+2 -2
unified split
+2 -2
drivers/net/cassini.c
··· 2586 { 2587 struct cas *cp = container_of(napi, struct cas, napi); 2588 struct net_device *dev = cp->dev; 2589 - int i, enable_intr, todo, credits; 2590 u32 status = readl(cp->regs + REG_INTR_STATUS); 2591 unsigned long flags; 2592 ··· 4350 struct cas *cp = netdev_priv(dev); 4351 4352 #ifdef USE_NAPI 4353 - napi_enable(&cp->napi); 4354 #endif 4355 /* Make sure we don't get distracted by suspend/resume */ 4356 mutex_lock(&cp->pm_mutex);
··· 2586 { 2587 struct cas *cp = container_of(napi, struct cas, napi); 2588 struct net_device *dev = cp->dev; 2589 + int i, enable_intr, credits; 2590 u32 status = readl(cp->regs + REG_INTR_STATUS); 2591 unsigned long flags; 2592 ··· 4350 struct cas *cp = netdev_priv(dev); 4351 4352 #ifdef USE_NAPI 4353 + napi_disable(&cp->napi); 4354 #endif 4355 /* Make sure we don't get distracted by suspend/resume */ 4356 mutex_lock(&cp->pm_mutex);