aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@linux-foundation.org>2007-10-28 17:14:06 +0100
committerFrancois Romieu <romieu@fr.zoreil.com>2007-10-28 18:21:06 +0100
commit93dd79e87bbc98ef02610d54fe72d4a1931ee15e (patch)
treedb6b68711756de24f6b5522ece074cea52a38b80 /drivers/net
parent7fab06c0ca89d99442a4baeddf417add585e2672 (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/r8169.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index c5eaf4931a9..b94fa7ef195 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()? */