Re: [PATCH 1/2] ax88796c: fix ioctl callback
From: Lukasz Stelmach <l.stelmach@samsung.com>
Date: 2021-11-05 13:20:06
Also in:
lkml
It was <2021-11-05 pią 10:29>, when Arnd Bergmann wrote:
From: Arnd Bergmann <arnd@arndb.de> The timestamp ioctls are now handled by the ndo_eth_ioctl() callback,
Actually neither the driver nor the chip support timstamping. ax88796c_ioctl() simply wraps phy_mii_ioctl(). I believe you swapped commit messages between this and the other patch in the series.
not the old ndo_do_ioctl(), but oax88796 introduced the
^^^ Typo here.
function for the old way.
At first I though — What did I mess up again? But then saw a76053707dbf is quite a new thing and ndo_do_ioctl() is still there, so my builds didn't fail. Thanks, for the patch.
Move it over to ndo_eth_ioctl() to actually allow calling it from
user space.
Fixes: a97c69ba4f30 ("net: ax88796c: ASIX AX88796C SPI Ethernet Adapter Driver")
Fixes: a76053707dbf ("dev_ioctl: split out ndo_eth_ioctl")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
It would be best to completely remove the .ndo_do_ioctl() callback
to avoid this problem in the future, but I'm still unsure whether
we want to just remove the ancient wireless and localtalk drivers
instead of fixing them.
---
drivers/net/ethernet/asix/ax88796c_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)Acked-by: Lukasz Stelmach <l.stelmach@samsung.com>
quoted hunk
diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c index 4b0c5a09fd57..8994f2322268 100644 --- a/drivers/net/ethernet/asix/ax88796c_main.c +++ b/drivers/net/ethernet/asix/ax88796c_main.c@@ -934,7 +934,7 @@ static const struct net_device_ops ax88796c_netdev_ops = { .ndo_stop = ax88796c_close, .ndo_start_xmit = ax88796c_start_xmit, .ndo_get_stats64 = ax88796c_get_stats64, - .ndo_do_ioctl = ax88796c_ioctl, + .ndo_eth_ioctl = ax88796c_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_set_features = ax88796c_set_features, };
-- Łukasz Stelmach Samsung R&D Institute Poland Samsung Electronics
Attachments
- signature.asc [application/pgp-signature] 487 bytes