summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2011-02-03 17:27:52 +0100
committerFrancois Romieu <romieu@fr.zoreil.com>2011-02-04 10:38:18 +0100
commitf60ac8e7ab7cbb413a0131d5665b053f9f386526 (patch)
tree45e54d0894186d2f12130ec580805dc50fcab1a5
parent1519e57fe81c14bb8fa4855579f19264d1ef63b4 (diff)
downloadblackbird-op-linux-f60ac8e7ab7cbb413a0131d5665b053f9f386526.tar.gz
blackbird-op-linux-f60ac8e7ab7cbb413a0131d5665b053f9f386526.zip
r8169: prevent RxFIFO induced loops in the irq handler.
While the RxFIFO interruption is masked for most 8168, nothing prevents it to appear in the irq status word. This is no excuse to crash. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Ivan Vecera <ivecera@redhat.com> Cc: Hayes <hayeswang@realtek.com>
-rw-r--r--drivers/net/r8169.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 40dabe2b3dae..59ccf0c5c610 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -4650,6 +4650,15 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
netif_stop_queue(dev);
rtl8169_tx_timeout(dev);
goto done;
+ /* Testers needed. */
+ case RTL_GIGA_MAC_VER_17:
+ case RTL_GIGA_MAC_VER_19:
+ case RTL_GIGA_MAC_VER_20:
+ case RTL_GIGA_MAC_VER_21:
+ case RTL_GIGA_MAC_VER_23:
+ case RTL_GIGA_MAC_VER_24:
+ case RTL_GIGA_MAC_VER_27:
+ case RTL_GIGA_MAC_VER_28:
/* Experimental science. Pktgen proof. */
case RTL_GIGA_MAC_VER_12:
case RTL_GIGA_MAC_VER_25:
OpenPOWER on IntegriCloud