diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2018-07-17 22:51:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-18 09:46:32 +0900 |
| commit | dd84957eeeae61b60c692ff821c958464576604f (patch) | |
| tree | 6a519c861956079650501c013efc74c25122865e | |
| parent | 4577243392ce36d90290c4101eb6ea6b5617026f (diff) | |
| download | linux-dd84957eeeae61b60c692ff821c958464576604f.tar.gz | |
r8169: use phy_ethtool_nway_reset
Switch to using phy_ethtool_nway_reset(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig index 7fb1af1f91ce..e1cd934c2e4f 100644 --- a/drivers/net/ethernet/realtek/Kconfig +++ b/drivers/net/ethernet/realtek/Kconfig @@ -100,7 +100,6 @@ config R8169 select FW_LOADER select CRC32 select PHYLIB - select MII ---help--- Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index a8329f32456b..7c56202f1185 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -1984,13 +1984,6 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data) } } -static int rtl8169_nway_reset(struct net_device *dev) -{ - struct rtl8169_private *tp = netdev_priv(dev); - - return mii_nway_restart(&tp->mii); -} - /* * Interrupt coalescing * @@ -2221,7 +2214,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { .get_sset_count = rtl8169_get_sset_count, .get_ethtool_stats = rtl8169_get_ethtool_stats, .get_ts_info = ethtool_op_get_ts_info, - .nway_reset = rtl8169_nway_reset, + .nway_reset = phy_ethtool_nway_reset, .get_link_ksettings = phy_ethtool_get_link_ksettings, .set_link_ksettings = phy_ethtool_set_link_ksettings, }; |