| Message ID | 20240807215834.33980-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1862923bf6ae9d023826abf79d9795a06aecb350 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: ag71xx: use phylink_mii_ioctl | expand |
On Wed, Aug 07, 2024 at 02:58:27PM -0700, Rosen Penev wrote: > 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> Andrew
On Wed, Aug 07, 2024 at 02:58:27PM -0700, Rosen Penev wrote: > 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> In future, please use ./scripts/get_maintainer.pl to determine who to Cc: the patch to. Andrew
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 7 Aug 2024 14:58:27 -0700 you wrote: > 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. > > [...] Here is the summary with links: - [net-next,v2] net: ag71xx: use phylink_mii_ioctl https://git.kernel.org/netdev/net-next/c/1862923bf6ae You are awesome, thank you!
diff --git a/drivers/net/ethernet/atheros/ag71xx.c b/drivers/net/ethernet/atheros/ag71xx.c index 6fc4996c8131..e252eca985b1 100644 --- a/drivers/net/ethernet/atheros/ag71xx.c +++ b/drivers/net/ethernet/atheros/ag71xx.c @@ -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) { @@ -1798,7 +1805,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,
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> --- drivers/net/ethernet/atheros/ag71xx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)