aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Lord <mlord@pobox.com>2007-11-08 16:29:07 -0500
committerJeff Garzik <jeff@garzik.org>2007-11-10 04:25:15 -0500
commit50d84c2dc00e48ff9ba018ed0dd23276cf79e566 (patch)
treee11c64ce3a27a9676b1ea1522357164b61c3002f
parent5a37a68dab77c234c80a8e25455d568f30e86c09 (diff)
r8169: revert 7da97ec96a0934319c7fbedd3d38baf533e20640 (bis repetita)
RTL_GIGA_MAC_VER_17 breaks as well. Signed-off-by: Mark Lord <mlord@pobox.com> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Edward Hsu <edward_hsu@realtek.com.tw>
-rw-r--r--drivers/net/r8169.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a37cf82b9ea7..f9ba2e478a69 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1247,16 +1247,6 @@ static void rtl8169sb_hw_phy_config(void __iomem *ioaddr)
1247 1247
1248 rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init)); 1248 rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
1249} 1249}
1250static void rtl8168b_hw_phy_config(void __iomem *ioaddr)
1251{
1252 struct phy_reg phy_reg_init[] = {
1253 { 0x1f, 0x0000 },
1254 { 0x10, 0xf41b },
1255 { 0x1f, 0x0000 }
1256 };
1257
1258 rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));
1259}
1260 1250
1261static void rtl8168cp_hw_phy_config(void __iomem *ioaddr) 1251static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)
1262{ 1252{
@@ -1326,12 +1316,6 @@ static void rtl_hw_phy_config(struct net_device *dev)
1326 case RTL_GIGA_MAC_VER_04: 1316 case RTL_GIGA_MAC_VER_04:
1327 rtl8169sb_hw_phy_config(ioaddr); 1317 rtl8169sb_hw_phy_config(ioaddr);
1328 break; 1318 break;
1329 case RTL_GIGA_MAC_VER_11:
1330 case RTL_GIGA_MAC_VER_12:
1331 break;
1332 case RTL_GIGA_MAC_VER_17:
1333 rtl8168b_hw_phy_config(ioaddr);
1334 break;
1335 case RTL_GIGA_MAC_VER_18: 1319 case RTL_GIGA_MAC_VER_18:
1336 rtl8168cp_hw_phy_config(ioaddr); 1320 rtl8168cp_hw_phy_config(ioaddr);
1337 break; 1321 break;