amd8111e: don't call napi_enable if configured w/o NAPI
The amd8111e network driver was broken by
bea3348eef
, which makes the driver
call napi_enable() and napi_disable() even if the driver had been
configured without CONFIG_AMD8111E_NAPI, and thus
netif_napi_add() had not been called on initialization.
This triggers a BUG in napi_enable().
This patch fixes the problem. Please apply.
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
77b6901573
commit
3defd0ee74
1 changed files with 6 additions and 0 deletions
|
@ -1340,7 +1340,9 @@ static int amd8111e_close(struct net_device * dev)
|
|||
struct amd8111e_priv *lp = netdev_priv(dev);
|
||||
netif_stop_queue(dev);
|
||||
|
||||
#ifdef CONFIG_AMD8111E_NAPI
|
||||
napi_disable(&lp->napi);
|
||||
#endif
|
||||
|
||||
spin_lock_irq(&lp->lock);
|
||||
|
||||
|
@ -1372,7 +1374,9 @@ static int amd8111e_open(struct net_device * dev )
|
|||
dev->name, dev))
|
||||
return -EAGAIN;
|
||||
|
||||
#ifdef CONFIG_AMD8111E_NAPI
|
||||
napi_enable(&lp->napi);
|
||||
#endif
|
||||
|
||||
spin_lock_irq(&lp->lock);
|
||||
|
||||
|
@ -1380,7 +1384,9 @@ static int amd8111e_open(struct net_device * dev )
|
|||
|
||||
if(amd8111e_restart(dev)){
|
||||
spin_unlock_irq(&lp->lock);
|
||||
#ifdef CONFIG_AMD8111E_NAPI
|
||||
napi_disable(&lp->napi);
|
||||
#endif
|
||||
if (dev->irq)
|
||||
free_irq(dev->irq, dev);
|
||||
return -ENOMEM;
|
||||
|
|
Reference in a new issue