diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2011-02-03 17:27:52 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:17:39 -0700 |
commit | 30b7cb312baeab0504e4ba1bc5b324abf7afcf68 (patch) | |
tree | cb59ca1e2aafee0d1eee5eb74dad781be4a843bb | |
parent | be70b4e2c60c2d7e03c3193cadd1cb9eddb5e4bc (diff) |
r8169: prevent RxFIFO induced loops in the irq handler.
commit f60ac8e7ab7cbb413a0131d5665b053f9f386526 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/net/r8169.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 3ba82e60e050..2eda96279f8e 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -4613,6 +4613,14 @@ 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: /* Experimental science. Pktgen proof. */ case RTL_GIGA_MAC_VER_12: case RTL_GIGA_MAC_VER_25: |