Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd84957e authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: use phy_ethtool_nway_reset 



Switch to using phy_ethtool_nway_reset().

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45772433

drivers/net/ethernet/realtek/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -100,7 +100,6 @@ config R8169 
	select FW_LOADER

	select FW_LOADER

	select CRC32

	select CRC32

	select PHYLIB

	select PHYLIB

	select MII

	---help---

	---help---

	  Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.

	  Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.

drivers/net/ethernet/realtek/r8169.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -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

 * Interrupt coalescing

 *

 *
@@ -2221,7 +2214,7 @@ static const struct ethtool_ops rtl8169_ethtool_ops = { 
	.get_sset_count		= rtl8169_get_sset_count,

	.get_sset_count		= rtl8169_get_sset_count,

	.get_ethtool_stats	= rtl8169_get_ethtool_stats,

	.get_ethtool_stats	= rtl8169_get_ethtool_stats,

	.get_ts_info		= ethtool_op_get_ts_info,

	.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,

	.get_link_ksettings	= phy_ethtool_get_link_ksettings,

	.set_link_ksettings	= phy_ethtool_set_link_ksettings,

	.set_link_ksettings	= phy_ethtool_set_link_ksettings,

};

};