From patchwork Tue Jul 27 13:45:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 486719 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp232699jas; Tue, 27 Jul 2021 06:47:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6KKsMZ6pWBY0QbrmZ3fsAz95ffQKq2skHF53xegbW9yAVin4dW6wXjChBCXoO2xUkbrVd X-Received: by 2002:a17:906:384c:: with SMTP id w12mr21797943ejc.445.1627393659102; Tue, 27 Jul 2021 06:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627393659; cv=none; d=google.com; s=arc-20160816; b=UzOz9TauV+Z+pSf1Ns83MD2T1igfIJHauBx4LGeILMMIhNLkk4RNC3MM1vf08Lyrhy bHIgGyCm0ntUEKLCZirUf5E3xxuBHSETZa8zEuLtaB4loZDU8moN8zZ53lPj5SzyzM2e 6t5BMAIO9Ilp+UGObcX6J8wk+3joSHsqaPTqOhMFiftOAJXX3U/JxzpCdM1YEvQlEFDe 11IXUHnuD1b/d5jz/S6Z3CWR9ZCvKRM9mT25+rKfmLr38zqaXv1a7PNGQEkZjychwO26 yOblM8yna7pHvFBnDSWh73gPkxQJZ4TtbeVh9vh+8tJr9CJia5mGCApM4sv0oIecfpSa 6BIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=hsysKiUEDhepvZeiK/SsEVDAalBFuGJV5H+nMEJTPts=; b=Oqk9KdiRoytSf2aZBpx5tsNfEz1e8Ve69+sqbgQsDUwYotblU2lZRlreuND50uwO8L rTIqBZxNnkA7qdj75e1WjAEfU3FdNIwLMDRnrEAMqS3MlaPGK7F4oFrB3++LlUFjJMcZ NNDGsmEkQk8NP9/rLlT/CrTRiLGZR9WmT0jjy8QFaCF+XB8TYu+OUVl5i35pr9iSZhEH CsCjOdwZgqhtBbGyR9IYL4rwtzn000fiApx4n9ds+6FswFNm99TFbr8i8aKdPnVsfMcG XepQe5OlyENpt4rASPwJqvANvGSMHPw2EdhK3zzisImFfvT7JjDR1HSq17OheU8pnII/ z//A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FFlfVIqH; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id um11si2887832ejb.419.2021.07.27.06.47.38; Tue, 27 Jul 2021 06:47:39 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FFlfVIqH; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237541AbhG0Nre (ORCPT + 8 others); Tue, 27 Jul 2021 09:47:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:46564 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237147AbhG0Nqs (ORCPT ); Tue, 27 Jul 2021 09:46:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 71BA461ABD; Tue, 27 Jul 2021 13:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627393599; bh=9HEmQTMcD+tGVqx872uJelDKhvWrPIrr/YltYHMDktc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FFlfVIqHVDaxeDE4pmV6k0c9/5GuaHZDoQKExEoQEQx7FspdegsjzvxITDpGqdQx/ eqhQIX9QLNlgXF5gO3WGOS4eKKZ4AoQbm29NA2Igk+aVWDFB864yVDCAe/cxmSixCS qxM2KL1uabypaItuNW938eBaP+ywZwKSZY5APFJrt3qgOrJ6GoVM7iajXC1hjtoCd5 kpyGe3itGmLxFwOEkrOH/0VFCJK8WhI30sJvMT9y0OneXn9xBfcJprB6fIA5cvLv2Y y8X3MUQlLjonpqWIdHlwDtWKwnCEBEuUlLIMplW6k48N6mFnY3IimI8mrDAOeeQc6/ KHuJIL/pYT0dA== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Arnd Bergmann , Paul Mackerras , 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 Message-Id: <20210727134517.1384504-24-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210727134517.1384504-1-arnd@kernel.org> References: <20210727134517.1384504-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann 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 Cc: linux-ppp@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/net/ppp/ppp_generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.29.2 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, };