dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Stephen Hemminger 2007-10-28 17:14:06 +01:00 committed by Francois Romieu
parent 7fab06c0ca
commit 93dd79e87b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/r8169.c
View File

@ -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()? */