Commit 86216268 authored by David S. Miller's avatar David S. Miller
Browse files

[CASSINI]: Fix two obvious NAPI bugs. 



1) close should do napi_disable() not napi_enable
2) remove unused local var 'todo'

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d011a231

drivers/net/cassini.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2586,7 +2586,7 @@ static int cas_poll(struct napi_struct *napi, int budget) 
{

{

	struct cas *cp = container_of(napi, struct cas, napi);

	struct cas *cp = container_of(napi, struct cas, napi);

	struct net_device *dev = cp->dev;

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

	u32 status = readl(cp->regs + REG_INTR_STATUS);

	unsigned long flags;

	unsigned long flags;
@@ -4350,7 +4350,7 @@ static int cas_close(struct net_device *dev) 
	struct cas *cp = netdev_priv(dev);

	struct cas *cp = netdev_priv(dev);





#ifdef USE_NAPI

#ifdef USE_NAPI

	napi_enable(&cp->napi);

	napi_disable(&cp->napi);

#endif

#endif

	/* Make sure we don't get distracted by suspend/resume */

	/* Make sure we don't get distracted by suspend/resume */

	mutex_lock(&cp->pm_mutex);

	mutex_lock(&cp->pm_mutex);