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

r8169: use generic ndo_do_ioctl handler phy_do_ioctl 



Replace rtl8169_ioctl with new generic function phy_do_ioctl.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ab1d925

drivers/net/ethernet/realtek/r8169_main.c

+1 −11
Original line number Diff line number Diff line
@@ -2298,16 +2298,6 @@ static int rtl_set_mac_address(struct net_device *dev, void *p) 
	return 0;

}



static int rtl8169_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	struct rtl8169_private *tp = netdev_priv(dev);



	if (!netif_running(dev))

		return -ENODEV;



	return phy_mii_ioctl(tp->phydev, ifr, cmd);

}



static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)

{

	switch (tp->mac_version) {
@@ -5168,7 +5158,7 @@ static const struct net_device_ops rtl_netdev_ops = { 
	.ndo_fix_features	= rtl8169_fix_features,

	.ndo_set_features	= rtl8169_set_features,

	.ndo_set_mac_address	= rtl_set_mac_address,

	.ndo_do_ioctl		= rtl8169_ioctl,

	.ndo_do_ioctl		= phy_do_ioctl,

	.ndo_set_rx_mode	= rtl_set_rx_mode,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller	= rtl8169_netpoll,

CRA Git | Maintained and supported by SUSTech CRA and CCSE