From 5648e13eab641ae2738714f2497e1fc1e2587a6d Mon Sep 17 00:00:00 2001
From: Ivan Vecera <ivecera@redhat.com>
Date: Thu, 27 Jan 2011 12:24:11 +0100
Subject: [PATCH] --- yaml --- r: 232895 b: refs/heads/master c:
 b5ba6d12bdac21bc0620a5089e0f24e362645efd h: refs/heads/master i:   232893:
 f54726393c98abc692a1799d6c427c15dfce9c07   232891:
 d3005329cd1d37f586ac17999815e081ff26bee5   232887:
 a9491aea6b975358c235f54c29f5bed7f6e82df0   232879:
 f57f1a423344818dfeb68baf199c6184199d19f7   232863:
 54f0845b45dcc4ed72597929be5140c18c830953   232831:
 bfcff1b931088498b2064ae29e441e15d085f098 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 54536b64c869..c26420726a5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38db9e1db1c91c953b2a539130257ce91533c9f6
+refs/heads/master: b5ba6d12bdac21bc0620a5089e0f24e362645efd
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index bde7d61f1930..9ab3b43c7d04 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -3757,7 +3757,8 @@ static void rtl_hw_start_8168(struct net_device *dev)
 	RTL_W16(IntrMitigate, 0x5151);
 
 	/* Work around for RxFIFO overflow. */
-	if (tp->mac_version == RTL_GIGA_MAC_VER_11) {
+	if (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+	    tp->mac_version == RTL_GIGA_MAC_VER_22) {
 		tp->intr_event |= RxFIFOOver | PCSTimeout;
 		tp->intr_event &= ~RxOverflow;
 	}
@@ -4641,7 +4642,8 @@ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance)
 
 		/* Work around for rx fifo overflow */
 		if (unlikely(status & RxFIFOOver) &&
-		(tp->mac_version == RTL_GIGA_MAC_VER_11)) {
+		    (tp->mac_version == RTL_GIGA_MAC_VER_11 ||
+		     tp->mac_version == RTL_GIGA_MAC_VER_22)) {
 			netif_stop_queue(dev);
 			rtl8169_tx_timeout(dev);
 			break;