From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Sun, 28 Oct 2007 16:14:06 +0000 (+0100)
Subject: r8169: remove poll_locked logic
X-Git-Tag: MMI-PSA29.97-13-9~38559^2~3^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93dd79e87bbc98ef02610d54fe72d4a1931ee15e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

r8169: remove poll_locked logic

Disabling napi polling early is well enough.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index c5eaf4931a91..b94fa7ef1955 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2991,13 +2991,16 @@ static void rtl8169_down(struct net_device *dev)
 {
 	struct rtl8169_private *tp = netdev_priv(dev);
 	void __iomem *ioaddr = tp->mmio_addr;
-	unsigned int poll_locked = 0;
 	unsigned int intrmask;
 
 	rtl8169_delete_timer(dev);
 
 	netif_stop_queue(dev);
 
+#ifdef CONFIG_R8169_NAPI
+	napi_disable(&tp->napi);
+#endif
+
 core_down:
 	spin_lock_irq(&tp->lock);
 
@@ -3011,13 +3014,6 @@ core_down:
 
 	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. */
 	synchronize_sched();  /* FIXME: should this be synchronize_irq()? */