r8169: merge handling of RTL8101e and RTL8100e

Chip versions 13, 14, 15 are treated the same by the driver, therefore
let's merge them.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/realtek/r8169.h b/drivers/net/ethernet/realtek/r8169.h
index 22a6a057b11ee162d526e1721273b6cfdd7afc76..afefdec9d191861654afc1afa6aa7cc5894e66c1 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.h
+++ b/drivers/net/ethernet/realtek/r8169.h
@@ -25,8 +25,6 @@ enum mac_version {
        RTL_GIGA_MAC_VER_11,
        RTL_GIGA_MAC_VER_12,
        RTL_GIGA_MAC_VER_13,
-       RTL_GIGA_MAC_VER_14,
-       RTL_GIGA_MAC_VER_15,
        RTL_GIGA_MAC_VER_16,
        RTL_GIGA_MAC_VER_17,
        RTL_GIGA_MAC_VER_18,

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 226205099253152fc73d66cf8b43ac92232eaf4f..124827b19a4a33e694da67d88ba270036d1e141c 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -105,9 +105,7 @@ static const struct {
        [RTL_GIGA_MAC_VER_10] = {"RTL8101e"                             },
        [RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b"                       },
        [RTL_GIGA_MAC_VER_12] = {"RTL8168b/8111b"                       },
-       [RTL_GIGA_MAC_VER_13] = {"RTL8101e"                             },
-       [RTL_GIGA_MAC_VER_14] = {"RTL8100e"                             },
-       [RTL_GIGA_MAC_VER_15] = {"RTL8100e"                             },
+       [RTL_GIGA_MAC_VER_13] = {"RTL8101e/RTL8100e"                    },
        [RTL_GIGA_MAC_VER_16] = {"RTL8101e"                             },
        [RTL_GIGA_MAC_VER_17] = {"RTL8168b/8111b"                       },
        [RTL_GIGA_MAC_VER_18] = {"RTL8168cp/8111cp"                     },
@@ -2009,8 +2007,8 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
                { 0x7c8, 0x248, RTL_GIGA_MAC_VER_09 },
                { 0x7c8, 0x340, RTL_GIGA_MAC_VER_16 },
                /* FIXME: where did these entries come from ? -- FR */
-               { 0xfc8, 0x388, RTL_GIGA_MAC_VER_15 },
-               { 0xfc8, 0x308, RTL_GIGA_MAC_VER_14 },
+               { 0xfc8, 0x388, RTL_GIGA_MAC_VER_13 },
+               { 0xfc8, 0x308, RTL_GIGA_MAC_VER_13 },
 
                /* 8110 family. */
                { 0xfc8, 0x980, RTL_GIGA_MAC_VER_06 },
@@ -3616,8 +3614,6 @@ static void rtl_hw_config(struct rtl8169_private *tp)
                [RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168b,
                [RTL_GIGA_MAC_VER_12] = rtl_hw_start_8168b,
                [RTL_GIGA_MAC_VER_13] = NULL,
-               [RTL_GIGA_MAC_VER_14] = NULL,
-               [RTL_GIGA_MAC_VER_15] = NULL,
                [RTL_GIGA_MAC_VER_16] = NULL,
                [RTL_GIGA_MAC_VER_17] = rtl_hw_start_8168b,
                [RTL_GIGA_MAC_VER_18] = rtl_hw_start_8168cp_1,

diff --git a/drivers/net/ethernet/realtek/r8169_phy_config.c b/drivers/net/ethernet/realtek/r8169_phy_config.c
index 0cf4893e5624b450bda29e9d7c6a1ac80a12460a..a0c2b3330e1ef3faee5bcf96aadde79bdf9d9f43 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
@@ -1261,8 +1261,6 @@ void r8169_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev,
                [RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,
                [RTL_GIGA_MAC_VER_12] = rtl8168bef_hw_phy_config,
                [RTL_GIGA_MAC_VER_13] = NULL,
-               [RTL_GIGA_MAC_VER_14] = NULL,
-               [RTL_GIGA_MAC_VER_15] = NULL,
                [RTL_GIGA_MAC_VER_16] = NULL,
                [RTL_GIGA_MAC_VER_17] = rtl8168bef_hw_phy_config,
                [RTL_GIGA_MAC_VER_18] = rtl8168cp_1_hw_phy_config,