[RFC,net-next,25/28] hippi: use ndo_siocdevprivate

Message ID	20201106221743.3271965-26-arnd@kernel.org
State	New
Headers	show Return-Path: <SRS0=ovox=EM=vger.kernel.org=linux-wireless-owner@kernel.org> From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, bridge@lists.linux-foundation.org, linux-hams@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>, Christoph Hellwig <hch@lst.de>, Alexander Viro <viro@zeniv.linux.org.uk>, Johannes Berg <johannes@sipsolutions.net>, Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com> Subject: [RFC net-next 25/28] hippi: use ndo_siocdevprivate Date: Fri, 6 Nov 2020 23:17:40 +0100 Message-Id: <20201106221743.3271965-26-arnd@kernel.org> In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org> References: <20201106221743.3271965-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	ndo_ioctl rework \| expand [RFC,net-next,00/28] ndo_ioctl rework [RFC,net-next,02/28] staging: rtlwifi: use siocdevprivate [RFC,net-next,03/28] staging: wlan-ng: use siocdevprivate [RFC,net-next,04/28] hostap: use ndo_siocdevprivate [RFC,net-next,06/28] bridge: use ndo_siocdevprivate [RFC,net-next,07/28] phonet: use siocdevprivate [RFC,net-next,10/28] appletalk: use ndo_siocdevprivate [RFC,net-next,11/28] hamachi: use ndo_siocdevprivate [RFC,net-next,14/28] fddi: use ndo_siocdevprivate [RFC,net-next,15/28] net: usb: use ndo_siocdevprivate [RFC,net-next,16/28] slip/plip: use ndo_siocdevprivate [RFC,net-next,17/28] qeth: use ndo_siocdevprivate [RFC,net-next,18/28] cxgb3: use ndo_siocdevprivate [RFC,net-next,20/28] dev_ioctl: split out ndo_eth_ioctl [RFC,net-next,21/28] wan: use ndo_siocdevprivate [RFC,net-next,22/28] hamradio: use ndo_siocdevprivate [RFC,net-next,23/28] airo: use ndo_siocdevprivate [RFC,net-next,25/28] hippi: use ndo_siocdevprivate [RFC,net-next,28/28] net: socket: return changed ifreq from SIOCDEVPRIVATE

Message ID

20201106221743.3271965-26-arnd@kernel.org

State

New

Headers

From: Arnd Bergmann <arnd@kernel.org>
To: netdev@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org,
	linux-wireless@vger.kernel.org, bridge@lists.linux-foundation.org,
	linux-hams@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
	Christoph Hellwig <hch@lst.de>, Alexander Viro <viro@zeniv.linux.org.uk>,
	Johannes Berg <johannes@sipsolutions.net>, Andrew Lunn <andrew@lunn.ch>,
	Heiner Kallweit <hkallweit1@gmail.com>
Subject: [RFC net-next 25/28] hippi: use ndo_siocdevprivate
Date: Fri,  6 Nov 2020 23:17:40 +0100
Message-Id: <20201106221743.3271965-26-arnd@kernel.org>
In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org>
References: <20201106221743.3271965-1-arnd@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

ndo_ioctl rework | expand

Commit Message

Arnd Bergmann Nov. 6, 2020, 10:17 p.m. UTC

From: Arnd Bergmann <arnd@arndb.de>

The rr_ioctl uses private ioctl commands that correctly pass
all data through ifr_data, which works fine in compat mode.

Change it to use ndo_siocdevprivate as a cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/hippi/rrunner.c | 11 ++++++-----
 drivers/net/hippi/rrunner.h |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 22010384c4a3..7661dbb31162 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -63,7 +63,7 @@  static const char version[] =
 static const struct net_device_ops rr_netdev_ops = {
 	.ndo_open 		= rr_open,
 	.ndo_stop		= rr_close,
-	.ndo_do_ioctl		= rr_ioctl,
+	.ndo_siocdevprivate	= rr_siocdevprivate,
 	.ndo_start_xmit		= rr_start_xmit,
 	.ndo_set_mac_address	= hippi_mac_addr,
 };
@@ -1568,7 +1568,8 @@  static int rr_load_firmware(struct net_device *dev)
 }
 
 
-static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int rr_siocdevprivate(struct net_device *dev, struct ifreq *rq,
+			     void __user *data, int cmd)
 {
 	struct rr_private *rrpriv;
 	unsigned char *image, *oldimage;
@@ -1603,7 +1604,7 @@  static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 			error = -EFAULT;
 			goto gf_out;
 		}
-		error = copy_to_user(rq->ifr_data, image, EEPROM_BYTES);
+		error = copy_to_user(data, image, EEPROM_BYTES);
 		if (error)
 			error = -EFAULT;
 	gf_out:
@@ -1615,7 +1616,7 @@  static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 			return -EPERM;
 		}
 
-		image = memdup_user(rq->ifr_data, EEPROM_BYTES);
+		image = memdup_user(data, EEPROM_BYTES);
 		if (IS_ERR(image))
 			return PTR_ERR(image);
 
@@ -1658,7 +1659,7 @@  static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 		return error;
 
 	case SIOCRRID:
-		return put_user(0x52523032, (int __user *)rq->ifr_data);
+		return put_user(0x52523032, (int __user *)data);
 	default:
 		return error;
 	}
diff --git a/drivers/net/hippi/rrunner.h b/drivers/net/hippi/rrunner.h
index 87533784604f..55377614e752 100644
--- a/drivers/net/hippi/rrunner.h
+++ b/drivers/net/hippi/rrunner.h
@@ -835,7 +835,8 @@  static int rr_open(struct net_device *dev);
 static netdev_tx_t rr_start_xmit(struct sk_buff *skb,
 				 struct net_device *dev);
 static int rr_close(struct net_device *dev);
-static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+static int rr_siocdevprivate(struct net_device *dev, struct ifreq *rq,
+			     void __user *data, int cmd);
 static unsigned int rr_read_eeprom(struct rr_private *rrpriv,
 				   unsigned long offset,
 				   unsigned char *buf,

[RFC,net-next,25/28] hippi: use ndo_siocdevprivate

Commit Message

Patch