| Message ID | 20240807185918.5815-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: ag71xx: use phylink_mii_ioctl | expand |
On Wed, Aug 07, 2024 at 11:58:46AM -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. > > Fixes: 892e09153fa3 ("net: ag71xx: port to phylink") I don't think the fixes tag is justified. phy_do_ioctl() should work, although i agree your change is the better way to do this. So for me, this patch is an improvement, not a fix. Or have you seen a real problem? Please read: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html#netdev-faq and mark this patch for net-next, without the Fixes tag. Andrew --- pw-bot: cr
On Wed, Aug 7, 2024 at 12:38 PM Andrew Lunn <andrew@lunn.ch> wrote: > > On Wed, Aug 07, 2024 at 11:58:46AM -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. > > > > Fixes: 892e09153fa3 ("net: ag71xx: port to phylink") > > I don't think the fixes tag is justified. phy_do_ioctl() should work, > although i agree your change is the better way to do this. So for me, > this patch is an improvement, not a fix. Or have you seen a real > problem? I have not no. I've just looked at other phylink drivers that seems to be using phylink_mii_ioctl. > > Please read: > > https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html#netdev-faq > > and mark this patch for net-next, without the Fixes tag. Will do. As it would be for net-next, would it make sense to mark this patch as v2? > > Andrew > > --- > pw-bot: cr
> Will do. As it would be for net-next, would it make sense to mark this > patch as v2? Yes, always use a new version indicator. Humans use this as well as tools to keep track of the different versions of a patch. Patches do often move between different trees, as they are reviewed and discussed, so the version is not scoped to the tree, but is unique over Linux as a whole. Andrew
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. Fixes: 892e09153fa3 ("net: ag71xx: port to phylink") Signed-off-by: Rosen Penev <rosenp@gmail.com> --- drivers/net/ethernet/atheros/ag71xx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)