]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ag71xx: use phylink_mii_ioctl
authorRosen Penev <rosenp@gmail.com>
Wed, 7 Aug 2024 21:58:27 +0000 (14:58 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 10 Aug 2024 05:10:09 +0000 (22:10 -0700)
f1294617d2f38bd2b9f6cce516b0326858b61182 removed the custom function for
ndo_eth_ioctl and used the standard phy_do_ioctl which calls
phy_mii_ioctl. However since then, this driver was ported to phylink
where it makes more sense to call phylink_mii_ioctl.

Bring back custom function that calls phylink_mii_ioctl.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/20240807215834.33980-1-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/atheros/ag71xx.c

index a38be924cdaa0dd6864ba7afdb207a4196638be0..2916fdb1970be48e7ffd0f3c029d7af059dee884 100644 (file)
@@ -447,6 +447,13 @@ static void ag71xx_int_disable(struct ag71xx *ag, u32 ints)
        ag71xx_cb(ag, AG71XX_REG_INT_ENABLE, ints);
 }
 
+static int ag71xx_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
+{
+       struct ag71xx *ag = netdev_priv(ndev);
+
+       return phylink_mii_ioctl(ag->phylink, ifr, cmd);
+}
+
 static void ag71xx_get_drvinfo(struct net_device *ndev,
                               struct ethtool_drvinfo *info)
 {
@@ -1799,7 +1806,7 @@ static const struct net_device_ops ag71xx_netdev_ops = {
        .ndo_open               = ag71xx_open,
        .ndo_stop               = ag71xx_stop,
        .ndo_start_xmit         = ag71xx_hard_start_xmit,
-       .ndo_eth_ioctl          = phy_do_ioctl,
+       .ndo_eth_ioctl          = ag71xx_do_ioctl,
        .ndo_tx_timeout         = ag71xx_tx_timeout,
        .ndo_change_mtu         = ag71xx_change_mtu,
        .ndo_set_mac_address    = eth_mac_addr,