Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3defd0ee authored by Jiri Bohac's avatar Jiri Bohac Committed by Jeff Garzik
Browse files

amd8111e: don't call napi_enable if configured w/o NAPI 



The amd8111e network driver was broken by
bea3348e, 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: default avatarJiri Bohac <jbohac@suse.cz>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 77b69015

drivers/net/amd8111e.c

+6 −0
Original line number Diff line number Diff line
@@ -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;