Subject: Re: [PATCH] r8169: Fix rtl8169_rx_interrupt()

From: David Miller <[email-masked]>
Date: Thu, 01 Apr 2010 18:43:45 -0700 (PDT)

From: Eric Dumazet <[email-masked]>
Date: Wed, 31 Mar 2010 14:08:31 +0200

> [PATCH net-next-2.6] r8169: Fix rtl8169_rx_interrupt()
> 
> In case a reset is performed, rtl8169_rx_interrupt() is called from
> process context instead of softirq context. Special care must be taken
> to call appropriate network core services (netif_rx() instead of
> netif_receive_skb()). VLAN handling also corrected.
> 
> Reported-by: Sergey Senozhatsky <[email-masked]>
> Tested-by: Sergey Senozhatsky <[email-masked]>
> Diagnosed-by: Oleg Nesterov <[email-masked]>
> Signed-off-by: Eric Dumazet <[email-masked]>

Applied to net-next-2.6, but:

> +/*
> + * Warning : rtl8169_rx_interrupt() might be called :
> + * 1) from NAPI (softirq) context
> + *	(polling = 1 : we should call netif_receive_skb())
> + * 2) from process context (rtl8169_reset_task())
> + *	(polling = 0 : we must call netif_rx() instead)
> + */		
      ^^^^^^^^

Trailing whitespace I had to delete.