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

Commit 53f57357 authored by françois romieu's avatar françois romieu Committed by David S. Miller
Browse files

r8169: revert "Handle rxfifo errors on 8168 chips" 

The original patch helps under obscure conditions (no pun) but
some 8168 do not like it. The change needs to be tightened with
a specific 8168 version.

This reverts commit 801e147c
("r8169: Handle rxfifo errors on 8168 chips").

Regression at https://bugzilla.kernel.org/show_bug.cgi?id=20882



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Tested-by: default avatarAndreas Radke <a.radke@arcor.de>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Daniel J Blueman <daniel.blueman@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18943d29

drivers/net/r8169.c

+3 −2
Original line number Diff line number Diff line
@@ -2931,7 +2931,7 @@ static const struct rtl_cfg_info { 
		.hw_start	= rtl_hw_start_8168,

		.region		= 2,

		.align		= 8,

		.intr_event	= SYSErr | RxFIFOOver | LinkChg | RxOverflow |

		.intr_event	= SYSErr | LinkChg | RxOverflow |

				  TxErr | TxOK | RxOK | RxErr,

		.napi_event	= TxErr | TxOK | RxOK | RxOverflow,

		.features	= RTL_FEATURE_GMII | RTL_FEATURE_MSI,
@@ -4588,7 +4588,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance) 
		}



		/* Work around for rx fifo overflow */

		if (unlikely(status & RxFIFOOver)) {

		if (unlikely(status & RxFIFOOver) &&

		(tp->mac_version == RTL_GIGA_MAC_VER_11)) {

			netif_stop_queue(dev);

			rtl8169_tx_timeout(dev);

			break;