Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 09:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

r8169: avoid needless NAPI poll scheduling

Browse Source 
Theory  : though needless, it should not have hurt.
Practice: it does not play nice with DEBUG_SHIRQ + LOCKDEP + UP
(see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=242572).

The patch makes sense in itself but I should dig why it has an effect
on #242572 (assuming that NAPI do not change in a near future).

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
This commit is contained in:
Francois Romieu 2007-08-02 00:00:48 +02:00 committed by Francois Romieu
parent 2584fbc3a6
commit 313b0305b5
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/r8169.c
View File

@ -2767,14 +2767,16 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
rtl8169_check_link_status(dev, tp, ioaddr); rtl8169_check_link_status(dev, tp, ioaddr);
#ifdef CONFIG_R8169_NAPI #ifdef CONFIG_R8169_NAPI
RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event); if (status & tp->napi_event) {
tp->intr_mask = ~tp->napi_event; RTL_W16(IntrMask, tp->intr_event & ~tp->napi_event);
tp->intr_mask = ~tp->napi_event;
if (likely(netif_rx_schedule_prep(dev))) if (likely(netif_rx_schedule_prep(dev)))
__netif_rx_schedule(dev); __netif_rx_schedule(dev);
else if (netif_msg_intr(tp)) { else if (netif_msg_intr(tp)) {
printk(KERN_INFO "%s: interrupt %04x taken in poll\n", printk(KERN_INFO "%s: interrupt %04x in poll\n",
dev->name, status); dev->name, status);
}
} }
break; break;
#else #else