From: Mark Lord <mlord@pobox.com>
Date: Thu, 8 Nov 2007 00:03:04 +0000 (+0100)
Subject: r8169: revert 7da97ec96a0934319c7fbedd3d38baf533e20640 (partly)
X-Git-Tag: v2.6.24-rc3~163^2~29
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9d04e2401bf308df921d3bbbdacab40fadc27bb;p=linux-2.6

r8169: revert 7da97ec96a0934319c7fbedd3d38baf533e20640 (partly)

Various symptoms depending on the .config options:
- the card stops working after some (short) time
- the card does not work at all
- the card disappears (nothing in lspci/dmesg)

A real power-off is needed to recover the card.

Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 9dbab3f2e5..a37cf82b9e 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1328,6 +1328,7 @@ static void rtl_hw_phy_config(struct net_device *dev)
 		break;
 	case RTL_GIGA_MAC_VER_11:
 	case RTL_GIGA_MAC_VER_12:
+		break;
 	case RTL_GIGA_MAC_VER_17:
 		rtl8168b_hw_phy_config(ioaddr);
 		break;