From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Arnd Bergmann <arnd@arndb.de>, Paul Mackerras <paulus@samba.org>, linux-ppp@vger.kernel.org Subject: [PATCH net-next v3 23/31] ppp: use ndo_siocdevprivate Date: Tue, 27 Jul 2021 15:45:09 +0200 [thread overview] Message-ID: <20210727134517.1384504-24-arnd@kernel.org> (raw) In-Reply-To: <20210727134517.1384504-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> ppp has a custom statistics interface using SIOCDEVPRIVATE ioctl commands that works correctly in compat mode. Convert it to use ndo_siocdevprivate as a cleanup. Cc: Paul Mackerras <paulus@samba.org> Cc: linux-ppp@vger.kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ppp/ppp_generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 930e49ef15f6..216a9f4e9750 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -1452,11 +1452,11 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev) } static int -ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +ppp_net_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *addr, int cmd) { struct ppp *ppp = netdev_priv(dev); int err = -EFAULT; - void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; struct ppp_comp_stats cstats; char *vers; @@ -1585,7 +1585,7 @@ static const struct net_device_ops ppp_netdev_ops = { .ndo_init = ppp_dev_init, .ndo_uninit = ppp_dev_uninit, .ndo_start_xmit = ppp_start_xmit, - .ndo_do_ioctl = ppp_net_ioctl, + .ndo_siocdevprivate = ppp_net_siocdevprivate, .ndo_get_stats64 = ppp_get_stats64, .ndo_fill_forward_path = ppp_fill_forward_path, }; -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Arnd Bergmann <arnd@arndb.de>, Paul Mackerras <paulus@samba.org>, linux-ppp@vger.kernel.org Subject: [PATCH net-next v3 23/31] ppp: use ndo_siocdevprivate Date: Tue, 27 Jul 2021 13:45:09 +0000 [thread overview] Message-ID: <20210727134517.1384504-24-arnd@kernel.org> (raw) In-Reply-To: <20210727134517.1384504-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> ppp has a custom statistics interface using SIOCDEVPRIVATE ioctl commands that works correctly in compat mode. Convert it to use ndo_siocdevprivate as a cleanup. Cc: Paul Mackerras <paulus@samba.org> Cc: linux-ppp@vger.kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/ppp/ppp_generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 930e49ef15f6..216a9f4e9750 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -1452,11 +1452,11 @@ ppp_start_xmit(struct sk_buff *skb, struct net_device *dev) } static int -ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +ppp_net_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *addr, int cmd) { struct ppp *ppp = netdev_priv(dev); int err = -EFAULT; - void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data; struct ppp_stats stats; struct ppp_comp_stats cstats; char *vers; @@ -1585,7 +1585,7 @@ static const struct net_device_ops ppp_netdev_ops = { .ndo_init = ppp_dev_init, .ndo_uninit = ppp_dev_uninit, .ndo_start_xmit = ppp_start_xmit, - .ndo_do_ioctl = ppp_net_ioctl, + .ndo_siocdevprivate = ppp_net_siocdevprivate, .ndo_get_stats64 = ppp_get_stats64, .ndo_fill_forward_path = ppp_fill_forward_path, }; -- 2.29.2
next prev parent reply other threads:[~2021-07-27 13:47 UTC|newest] Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-27 13:44 [PATCH net-next v3 00/31] ndo_ioctl rework Arnd Bergmann 2021-07-27 13:44 ` [Bridge] " Arnd Bergmann 2021-07-27 13:44 ` Arnd Bergmann 2021-07-27 13:44 ` Arnd Bergmann 2021-07-27 13:44 ` Arnd Bergmann 2021-07-27 13:44 ` Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 01/31] net: split out SIOCDEVPRIVATE handling from dev_ioctl Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 02/31] staging: rtlwifi: use siocdevprivate Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 03/31] staging: wlan-ng: " Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 04/31] hostap: use ndo_siocdevprivate Arnd Bergmann 2021-07-28 7:07 ` Kalle Valo 2021-07-27 13:44 ` [PATCH net-next v3 05/31] bridge: " Arnd Bergmann 2021-07-27 13:44 ` [Bridge] " Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 06/31] phonet: use siocdevprivate Arnd Bergmann 2021-07-27 16:03 ` Rémi Denis-Courmont 2021-07-27 13:44 ` [PATCH net-next v3 07/31] tulip: use ndo_siocdevprivate Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 08/31] bonding: use siocdevprivate Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 09/31] appletalk: use ndo_siocdevprivate Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 10/31] hamachi: " Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 11/31] tehuti: " Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 12/31] eql: " Arnd Bergmann 2021-07-27 13:44 ` [PATCH net-next v3 13/31] fddi: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 14/31] net: usb: " Arnd Bergmann 2021-07-28 13:02 ` Petko Manolov 2021-07-27 13:45 ` [PATCH net-next v3 15/31] slip/plip: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 16/31] qeth: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 17/31] cxgb3: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 18/31] hamradio: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 19/31] airo: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 20/31] ip_tunnel: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 21/31] hippi: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 22/31] sb1000: " Arnd Bergmann 2021-07-27 13:45 ` Arnd Bergmann [this message] 2021-07-27 13:45 ` [PATCH net-next v3 23/31] ppp: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 24/31] wan: " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 25/31] wan: cosa: remove dead cosa_net_ioctl() function Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 26/31] dev_ioctl: pass SIOCDEVPRIVATE data separately Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 27/31] dev_ioctl: split out ndo_eth_ioctl Arnd Bergmann 2021-07-27 16:30 ` Jason Gunthorpe 2021-07-27 13:45 ` [PATCH net-next v3 28/31] net: split out ndo_siowandev ioctl Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 29/31] net: socket: return changed ifreq from SIOCDEVPRIVATE Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 30/31] net: bridge: move bridge ioctls out of .ndo_do_ioctl Arnd Bergmann 2021-07-27 13:45 ` [Bridge] " Arnd Bergmann 2021-07-27 13:45 ` [PATCH net-next v3 31/31] net: bonding: move ioctl handling to private ndo operation Arnd Bergmann 2021-07-27 19:59 ` [PATCH net-next v3 00/31] ndo_ioctl rework patchwork-bot+netdevbpf 2021-07-27 20:00 ` [Bridge] " patchwork-bot+netdevbpf 2021-07-27 20:00 ` patchwork-bot+netdevbpf 2021-07-27 20:00 ` patchwork-bot+netdevbpf 2021-07-27 20:00 ` patchwork-bot+netdevbpf 2021-07-27 20:00 ` patchwork-bot+netdevbpf
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210727134517.1384504-24-arnd@kernel.org \ --to=arnd@kernel.org \ --cc=arnd@arndb.de \ --cc=davem@davemloft.net \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-ppp@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=paulus@samba.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.