Commit 93dd79e8 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Francois Romieu
Browse files

r8169: remove poll_locked logic 



Disabling napi polling early is well enough.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 7fab06c0

drivers/net/r8169.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -2991,13 +2991,16 @@ static void rtl8169_down(struct net_device *dev) 
{

{

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);

	void __iomem *ioaddr = tp->mmio_addr;

	void __iomem *ioaddr = tp->mmio_addr;

	unsigned int poll_locked = 0;

	unsigned int intrmask;

	unsigned int intrmask;





	rtl8169_delete_timer(dev);

	rtl8169_delete_timer(dev);





	netif_stop_queue(dev);

	netif_stop_queue(dev);





#ifdef CONFIG_R8169_NAPI

	napi_disable(&tp->napi);

#endif



core_down:

core_down:

	spin_lock_irq(&tp->lock);

	spin_lock_irq(&tp->lock);
@@ -3011,13 +3014,6 @@ static void rtl8169_down(struct net_device *dev) 




	synchronize_irq(dev->irq);

	synchronize_irq(dev->irq);





	if (!poll_locked) {

#ifdef CONFIG_R8169_NAPI

		napi_disable(&tp->napi);

#endif

		poll_locked++;

	}



	/* Give a racing hard_start_xmit a few cycles to complete. */

	/* Give a racing hard_start_xmit a few cycles to complete. */

	synchronize_sched();  /* FIXME: should this be synchronize_irq()? */

	synchronize_sched();  /* FIXME: should this be synchronize_irq()? */