Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 313b0305 authored by Francois Romieu's avatar Francois Romieu Committed by Francois Romieu
Browse files

r8169: avoid needless NAPI poll scheduling 

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: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 2584fbc3

drivers/net/r8169.c

+10 −8
Original line number Diff line number Diff line
@@ -2767,15 +2767,17 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) 
			rtl8169_check_link_status(dev, tp, ioaddr);



#ifdef CONFIG_R8169_NAPI

		if (status & 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)))

				__netif_rx_schedule(dev);

			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);

			}

		}

		break;

#else

		/* Rx interrupt */