Commit 50d84c2d authored by Mark Lord's avatar Mark Lord Committed by Jeff Garzik
Browse files

r8169: revert 7da97ec9 (bis repetita) 



RTL_GIGA_MAC_VER_17 breaks as well.

Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Edward Hsu <edward_hsu@realtek.com.tw>
parent 5a37a68d

drivers/net/r8169.c

+0 −16
Original line number Diff line number Diff line
@@ -1247,16 +1247,6 @@ static void rtl8169sb_hw_phy_config(void __iomem *ioaddr) 


	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));

}

static void rtl8168b_hw_phy_config(void __iomem *ioaddr)

{

	struct phy_reg phy_reg_init[] = {

		{ 0x1f, 0x0000 },

		{ 0x10, 0xf41b },

		{ 0x1f, 0x0000 }

	};



	rtl_phy_write(ioaddr, phy_reg_init, ARRAY_SIZE(phy_reg_init));

}



static void rtl8168cp_hw_phy_config(void __iomem *ioaddr)

{
@@ -1326,12 +1316,6 @@ static void rtl_hw_phy_config(struct net_device *dev) 
	case RTL_GIGA_MAC_VER_04:

		rtl8169sb_hw_phy_config(ioaddr);

		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;

	case RTL_GIGA_MAC_VER_18:

		rtl8168cp_hw_phy_config(ioaddr);

		break;