renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 06:04:05 +08:00
Code

r8169: use generic ndo_do_ioctl handler phy_do_ioctl

Browse Source 
Replace rtl8169_ioctl with new generic function phy_do_ioctl.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2020-01-19 14:32:49 +01:00 committed by David S. Miller
parent 2ab1d925aa
commit df00718648
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/realtek/r8169_main.c
View File

@ -2298,16 +2298,6 @@ static int rtl_set_mac_address(struct net_device *dev, void *p)
return 0; 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) static void rtl_wol_suspend_quirk(struct rtl8169_private *tp)
{ {
switch (tp->mac_version) { switch (tp->mac_version) {
@ -5168,7 +5158,7 @@ static const struct net_device_ops rtl_netdev_ops = {
.ndo_fix_features = rtl8169_fix_features, .ndo_fix_features = rtl8169_fix_features,
.ndo_set_features = rtl8169_set_features, .ndo_set_features = rtl8169_set_features,
.ndo_set_mac_address = rtl_set_mac_address, .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, .ndo_set_rx_mode = rtl_set_rx_mode,
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = rtl8169_netpoll, .ndo_poll_controller = rtl8169_netpoll,