ndo_ioctl rework
Subsystems (119)
v3 cover ndo_ioctl rework
From: Arnd Bergmann <[email protected]>
This series is a follow-up to the series for removing compat_alloc_user_space() and copy_in_user() that has now been merged.
I wanted to be sure I address all the ways that 'struct ifreq' is used in device drivers through .ndo_do_ioctl, originally to prove that my approach of changing the struct definition was correct, but then I discarded that approach and went on anyway.
Roughly, the contents here are:
- split out all the users of SIOCDEVPRIVATE ioctls into a separate ndo_siocdevprivate callback, to better see what gets used where
- fix compat handling for those drivers that pass data directly inside of 'ifreq' rather than using an indirect ifr_data pointer
- remove unreachable code in ndo_ioctl handlers that relies on command codes we never pass into that, in particular for wireless drivers
- split out the ethernet specific ioctls into yet another ndo_eth_ioctl callback, as these are by far the most common use of ndo_do_ioctl today. I considered splitting them further into MII and timestamp controls, but went with the simpler change for now.
- split out bonding and wandev ioctls into separate helpers
- rework the bridge handling with a separate callback
At this point, only a few oddball things remain in ndo_do_ioctl:
appletalk and ieee802154 pass down SIOCSIFADDR/SIOCGIFADDR and some wireless drivers have completely dead code.
I have thoroughly compile tested this on randconfig builds, but not done any notable runtime testing, so please review. All of it is also available as part of a larger branch at
https://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git \
compat-alloc-user-space-12
Changes since v2:
- rebase to net-next
- fix qeth regression
- Cc driver maintainers for each patch and in cover letter
Changes since v1:
- rebase to linux-5.14-rc2
- add conversion for ndo_siowandev, bridge and bonding drivers
- leave broken wifi drivers untouched for now
Arnd Bergmann (31):
net: split out SIOCDEVPRIVATE handling from dev_ioctl
staging: rtlwifi: use siocdevprivate
staging: wlan-ng: use siocdevprivate
hostap: use ndo_siocdevprivate
bridge: use ndo_siocdevprivate
phonet: use siocdevprivate
tulip: use ndo_siocdevprivate
bonding: use siocdevprivate
appletalk: use ndo_siocdevprivate
hamachi: use ndo_siocdevprivate
tehuti: use ndo_siocdevprivate
eql: use ndo_siocdevprivate
fddi: use ndo_siocdevprivate
net: usb: use ndo_siocdevprivate
slip/plip: use ndo_siocdevprivate
qeth: use ndo_siocdevprivate
cxgb3: use ndo_siocdevprivate
hamradio: use ndo_siocdevprivate
airo: use ndo_siocdevprivate
ip_tunnel: use ndo_siocdevprivate
hippi: use ndo_siocdevprivate
sb1000: use ndo_siocdevprivate
ppp: use ndo_siocdevprivate
wan: use ndo_siocdevprivate
wan: cosa: remove dead cosa_net_ioctl() function
dev_ioctl: pass SIOCDEVPRIVATE data separately
dev_ioctl: split out ndo_eth_ioctl
net: split out ndo_siowandev ioctl
net: socket: return changed ifreq from SIOCDEVPRIVATE
net: bridge: move bridge ioctls out of .ndo_do_ioctl
net: bonding: move ioctl handling to private ndo operation
Documentation/networking/netdevices.rst | 29 +++++ Documentation/networking/timestamping.rst | 6 +- drivers/char/pcmcia/synclink_cs.c | 23 ++-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 +- drivers/net/appletalk/ipddp.c | 16 ++- drivers/net/bonding/bond_main.c | 74 ++++++++--- drivers/net/eql.c | 24 ++-- drivers/net/ethernet/3com/3c574_cs.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 4 +- drivers/net/ethernet/8390/ax88796.c | 2 +- drivers/net/ethernet/8390/axnet_cs.c | 2 +- drivers/net/ethernet/8390/pcnet_cs.c | 2 +- drivers/net/ethernet/actions/owl-emac.c | 6 +- drivers/net/ethernet/adaptec/starfire.c | 2 +- drivers/net/ethernet/agere/et131x.c | 2 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- drivers/net/ethernet/amd/amd8111e.c | 2 +- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- .../net/ethernet/aquantia/atlantic/aq_main.c | 2 +- drivers/net/ethernet/arc/emac_main.c | 2 +- drivers/net/ethernet/atheros/ag71xx.c | 2 +- drivers/net/ethernet/atheros/alx/main.c | 2 +- .../net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- .../net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- drivers/net/ethernet/broadcom/b44.c | 2 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bnx2.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 4 +- .../net/ethernet/cavium/liquidio/lio_main.c | 2 +- .../ethernet/cavium/liquidio/lio_vf_main.c | 2 +- .../net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- .../net/ethernet/cavium/thunder/nicvf_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 14 +- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- drivers/net/ethernet/davicom/dm9000.c | 2 +- drivers/net/ethernet/dec/tulip/de4x5.c | 11 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- drivers/net/ethernet/dlink/dl2k.c | 2 +- drivers/net/ethernet/dlink/sundance.c | 2 +- drivers/net/ethernet/dnet.c | 2 +- drivers/net/ethernet/ethoc.c | 2 +- drivers/net/ethernet/faraday/ftgmac100.c | 2 +- drivers/net/ethernet/faraday/ftmac100.c | 2 +- drivers/net/ethernet/fealnx.c | 2 +- .../net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- .../net/ethernet/freescale/enetc/enetc_pf.c | 2 +- .../net/ethernet/freescale/enetc/enetc_vf.c | 2 +- drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- drivers/net/ethernet/ibm/emac/core.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 2 +- drivers/net/ethernet/intel/e100.c | 2 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/ice/ice_main.c | 6 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/jme.c | 2 +- drivers/net/ethernet/korina.c | 2 +- drivers/net/ethernet/lantiq_etop.c | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/marvell/skge.c | 2 +- drivers/net/ethernet/marvell/sky2.c | 4 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- .../net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- .../ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- .../mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_main.c | 4 +- .../net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- drivers/net/ethernet/micrel/ks8851_common.c | 2 +- drivers/net/ethernet/micrel/ksz884x.c | 2 +- drivers/net/ethernet/microchip/lan743x_main.c | 2 +- drivers/net/ethernet/mscc/ocelot_net.c | 2 +- drivers/net/ethernet/natsemi/natsemi.c | 2 +- drivers/net/ethernet/neterion/s2io.c | 2 +- .../net/ethernet/neterion/vxge/vxge-main.c | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 2 +- .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- drivers/net/ethernet/packetengines/hamachi.c | 63 +++++---- .../net/ethernet/packetengines/yellowfin.c | 2 +- .../net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- drivers/net/ethernet/rdc/r6040.c | 2 +- drivers/net/ethernet/realtek/8139cp.c | 2 +- drivers/net/ethernet/realtek/8139too.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 2 +- drivers/net/ethernet/renesas/sh_eth.c | 4 +- .../net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/falcon/efx.c | 2 +- drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- drivers/net/ethernet/sgi/meth.c | 2 +- drivers/net/ethernet/sis/sis190.c | 2 +- drivers/net/ethernet/sis/sis900.c | 2 +- drivers/net/ethernet/smsc/epic100.c | 2 +- drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- drivers/net/ethernet/smsc/smsc911x.c | 2 +- drivers/net/ethernet/smsc/smsc9420.c | 2 +- drivers/net/ethernet/socionext/netsec.c | 2 +- drivers/net/ethernet/socionext/sni_ave.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/sun/cassini.c | 2 +- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/sun/sungem.c | 2 +- .../net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- drivers/net/ethernet/tehuti/tehuti.c | 18 +-- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpmac.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/ethernet/ti/cpsw_new.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 2 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ethernet/ti/tlan.c | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 2 +- drivers/net/ethernet/toshiba/tc35815.c | 2 +- drivers/net/ethernet/tundra/tsi108_eth.c | 2 +- drivers/net/ethernet/via/via-rhine.c | 2 +- drivers/net/ethernet/via/via-velocity.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- drivers/net/fddi/skfp/skfddi.c | 19 ++- drivers/net/hamradio/baycom_epp.c | 9 +- drivers/net/hamradio/baycom_par.c | 12 +- drivers/net/hamradio/baycom_ser_fdx.c | 12 +- drivers/net/hamradio/baycom_ser_hdx.c | 12 +- drivers/net/hamradio/bpqether.c | 9 +- drivers/net/hamradio/dmascc.c | 18 ++- drivers/net/hamradio/hdlcdrv.c | 20 +-- drivers/net/hamradio/scc.c | 13 +- drivers/net/hamradio/yam.c | 19 ++- drivers/net/hippi/rrunner.c | 11 +- drivers/net/hippi/rrunner.h | 3 +- drivers/net/macvlan.c | 8 +- drivers/net/phy/phy.c | 4 +- drivers/net/plip/plip.c | 12 +- drivers/net/ppp/ppp_generic.c | 6 +- drivers/net/sb1000.c | 20 +-- drivers/net/slip/slip.c | 13 +- drivers/net/usb/asix_devices.c | 6 +- drivers/net/usb/ax88172a.c | 2 +- drivers/net/usb/ax88179_178a.c | 2 +- drivers/net/usb/cdc-phonet.c | 5 +- drivers/net/usb/dm9601.c | 2 +- drivers/net/usb/lan78xx.c | 2 +- drivers/net/usb/mcs7830.c | 2 +- drivers/net/usb/pegasus.c | 5 +- drivers/net/usb/r8152.c | 2 +- drivers/net/usb/rtl8150.c | 5 +- drivers/net/usb/smsc75xx.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/usb/sr9700.c | 2 +- drivers/net/usb/sr9800.c | 2 +- drivers/net/wan/c101.c | 33 +++-- drivers/net/wan/cosa.c | 15 +-- drivers/net/wan/farsync.c | 123 ++++++++++-------- drivers/net/wan/fsl_ucc_hdlc.c | 19 ++- drivers/net/wan/hdlc.c | 9 +- drivers/net/wan/hdlc_cisco.c | 14 +- drivers/net/wan/hdlc_fr.c | 40 +++--- drivers/net/wan/hdlc_ppp.c | 8 +- drivers/net/wan/hdlc_raw.c | 14 +- drivers/net/wan/hdlc_raw_eth.c | 14 +- drivers/net/wan/hdlc_x25.c | 16 +-- drivers/net/wan/hostess_sv11.c | 7 +- drivers/net/wan/ixp4xx_hss.c | 19 ++- drivers/net/wan/lmc/lmc.h | 2 +- drivers/net/wan/lmc/lmc_main.c | 33 +++-- drivers/net/wan/lmc/lmc_proto.c | 7 - drivers/net/wan/lmc/lmc_proto.h | 1 - drivers/net/wan/n2.c | 32 +++-- drivers/net/wan/pc300too.c | 44 ++++--- drivers/net/wan/pci200syn.c | 32 +++-- drivers/net/wan/sbni.c | 15 ++- drivers/net/wan/sealevel.c | 10 +- drivers/net/wan/wanxl.c | 21 ++- drivers/net/wireless/cisco/airo.c | 15 ++- drivers/net/wireless/intersil/hostap/hostap.h | 3 +- .../wireless/intersil/hostap/hostap_ioctl.c | 30 ++++- .../wireless/intersil/hostap/hostap_main.c | 3 + drivers/s390/net/qeth_core.h | 5 +- drivers/s390/net/qeth_core_main.c | 35 +++-- drivers/s390/net/qeth_l2_main.c | 3 +- drivers/s390/net/qeth_l3_main.c | 12 +- drivers/staging/octeon/ethernet.c | 12 +- .../staging/rtl8188eu/include/osdep_intf.h | 2 + .../staging/rtl8188eu/include/rtw_android.h | 3 +- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 3 - drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 + .../staging/rtl8188eu/os_dep/rtw_android.c | 14 +- .../staging/rtl8723bs/include/osdep_intf.h | 2 + .../staging/rtl8723bs/os_dep/ioctl_linux.c | 18 ++- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 + drivers/staging/wlan-ng/p80211netdev.c | 76 ++--------- drivers/tty/synclink_gt.c | 19 ++- include/linux/hdlc.h | 4 +- include/linux/hdlcdrv.h | 2 +- include/linux/if_bridge.h | 7 +- include/linux/netdevice.h | 28 +++- include/net/dsa.h | 14 +- include/net/ip_tunnels.h | 3 +- net/8021q/vlan_dev.c | 6 +- net/bridge/br.c | 2 +- net/bridge/br_device.c | 2 +- net/bridge/br_ioctl.c | 52 ++++---- net/bridge/br_private.h | 7 +- net/core/dev_ioctl.c | 104 +++++++++++---- net/dsa/master.c | 6 +- net/dsa/slave.c | 2 +- net/ethtool/ioctl.c | 3 +- net/ipv4/ip_gre.c | 2 +- net/ipv4/ip_tunnel.c | 9 +- net/ipv4/ip_vti.c | 2 +- net/ipv4/ipip.c | 2 +- net/ipv6/ip6_gre.c | 17 +-- net/ipv6/ip6_tunnel.c | 21 +-- net/ipv6/ip6_vti.c | 21 +-- net/ipv6/sit.c | 35 ++--- net/phonet/pn_dev.c | 6 +- net/socket.c | 90 ++++++------- 254 files changed, 1134 insertions(+), 957 deletions(-)
Signature · 43 lines
2.29.2 Cc: "David S. Miller" <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: Jay Vosburgh <[email protected]> Cc: Veaceslav Falico <[email protected]> Cc: Andy Gospodarek <[email protected]> Cc: Raju Rangoju <[email protected]> Cc: Thomas Sailer <[email protected]> Cc: Joerg Reuter <[email protected]> Cc: Jean-Paul Roubelat <[email protected]> Cc: Jes Sorensen <[email protected]> Cc: Krzysztof Halasa <[email protected]> Cc: "Jan \"Yenya\" Kasprzak" <[email protected]> Cc: Kevin Curtis <[email protected]> Cc: Zhao Qiang <[email protected]> Cc: Martin Schiller <[email protected]> Cc: Kalle Valo <[email protected]> Cc: Jouni Malinen <[email protected]> Cc: Julian Wiedmann <[email protected]> Cc: Karsten Graul <[email protected]> Cc: Hideaki YOSHIFUJI <[email protected]> Cc: David Ahern <[email protected]> Cc: Roopa Prabhu <[email protected]> Cc: Nikolay Aleksandrov <[email protected]> Cc: Steffen Klassert <[email protected]> Cc: Herbert Xu <[email protected]> Cc: Remi Denis-Courmont <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
PATCH v3 1/31 net: split out SIOCDEVPRIVATE handling from dev_ioctl
From: Arnd Bergmann <[email protected]>
SIOCDEVPRIVATE ioctl commands are mainly used in really old drivers, and they have a number of problems:
- They hide behind the normal .ndo_do_ioctl function that is also used for other things in modern drivers, so it's hard to spot a driver that actually uses one of these
- Since drivers use a number different calling conventions, it is impossible to support compat mode for them in a generic way.
- With all drivers using the same 16 commands codes, there is no way to introspect the data being passed through things like strace.
Add a new net_device_ops callback pointer, to address the first two of these. Separating them from .ndo_do_ioctl makes it easy to grep for drivers with a .ndo_siocdevprivate callback, and the unwieldy name hopefully makes it easier to spot in code review.
By passing the ifreq structure and the ifr_data pointer separately, it is no longer necessary to overload these, and the driver can use either one for a given command.
--- Documentation/networking/netdevices.rst | 7 +++++++ include/linux/netdevice.h | 3 +++ net/core/dev_ioctl.c | 25 ++++++++++++++++++++++--- 3 files changed, 32 insertions(+), 3 deletions(-)
Documentation/networking/netdevices.rst +7 -0
@@ -222,6 +222,13 @@ ndo_do_ioctl: Synchronization: rtnl_lock() semaphore. Context: process +ndo_siocdevprivate: + Synchronization: rtnl_lock() semaphore. + Context: process + + This is used to implement SIOCDEVPRIVATE ioctl helpers. + These should not be added to new drivers, so don't use. + ndo_get_stats: Synchronization: rtnl_lock() semaphore, dev_base_lock rwlock, or RCU. Context: atomic (can't sleep under rwlock or RCU)
include/linux/netdevice.h +3 -0
@@ -1361,6 +1361,9 @@ struct net_device_ops {int (*ndo_validate_addr)(struct net_device *dev);int (*ndo_do_ioctl)(struct net_device *dev,struct ifreq *ifr,int cmd); +int (*ndo_siocdevprivate)(struct net_device *dev, +struct ifreq *ifr, +void __user *data,int cmd);int (*ndo_set_config)(struct net_device *dev,struct ifmap *map); int (*ndo_change_mtu)(struct net_device *dev,
net/core/dev_ioctl.c +22 -3
@@ -259,6 +259,23 @@ static int dev_do_ioctl(struct net_device *dev,return err; } +static int dev_siocdevprivate (struct net_device *dev, +struct ifreq *ifr,unsigned int cmd) +{ +const struct net_device_ops *ops = dev->netdev_ops; +void __user *data = ifr->ifr_data; + +if (ops->ndo_siocdevprivate) { +if (netif_device_present (dev)) +return ops->ndo_siocdevprivate (dev, ifr, data, cmd); +else +return -ENODEV ; + } + +/* fall back to do_ioctl for drivers not yet converted */ +return dev_do_ioctl (dev, ifr, cmd); +} +/* * Perform the SIOCxIFxxx calls, inside rtnl_lock() */
@@ -336,9 +353,11 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)* Unknown or private ioctl */ default : - if ((cmd >= SIOCDEVPRIVATE && - cmd <= SIOCDEVPRIVATE + 15) || - cmd == SIOCBONDENSLAVE || +if (cmd >=SIOCDEVPRIVATE && + cmd <=SIOCDEVPRIVATE +15 ) +return dev_siocdevprivate (dev, ifr, cmd); + + if (cmd == SIOCBONDENSLAVE || cmd == SIOCBONDRELEASE || cmd == SIOCBONDSETHWADDR || cmd == SIOCBONDSLAVEINFOQUERY ||
Signature · 1 line
2.29.2
PATCH v3 2/31 staging: rtlwifi: use siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
rtl8188eu has an "android private" ioctl command multiplexer that is not currently safe for use in compat mode because of its triple-indirect pointer.
rtl8723bs uses a different interface on the SIOCDEVPRIVATE command, based on the iwpriv data structure
Both also have normal unreachable iwpriv commands, and all of the above should probably just get removed. For the moment, just switch over to the new interface.
--- drivers/staging/rtl8188eu/include/osdep_intf.h | 2 ++ .../staging/rtl8188eu/include/rtw_android.h | 3 ++- drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 3 --- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 14 +++++++++++--- drivers/staging/rtl8723bs/include/osdep_intf.h | 2 ++ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 18 +++++++++++++++--- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 + 8 files changed, 34 insertions(+), 10 deletions(-)
drivers/staging/rtl8188eu/include/osdep_intf.h +2 -0
@@ -22,6 +22,8 @@ void rtw_stop_drv_threads(struct adapter *padapter);void rtw_cancel_all_timer (struct adapter *padapter);int rtw_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +int rtw_android_priv_cmd (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);struct net_device *rtw_init_netdev (void );u16 rtw_recv_select_queue (struct sk_buff *skb);
drivers/staging/rtl8188eu/include/rtw_android.h +2 -1
@@ -45,6 +45,7 @@ enum ANDROID_WIFI_CMD {ANDROID_WIFI_CMD_MAX }; -int rtw_android_priv_cmd (struct net_device *net,struct ifreq *ifr,int cmd); +int rtw_android_priv_cmd (struct net_device *net,struct ifreq *ifr, +void __user *data,int cmd);#endif /* __RTW_ANDROID_H__ */
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +0 -3
@@ -2769,9 +2769,6 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ret =rtw_hostapd_ioctl (dev, &wrq->u.data);break ;#endif /* CONFIG_88EU_AP_MODE */ -case (SIOCDEVPRIVATE +1 ): - ret =rtw_android_priv_cmd (dev, rq, cmd); -break ;default : ret = -EOPNOTSUPP ;break ;
drivers/staging/rtl8188eu/os_dep/os_intfs.c +1 -0
@@ -288,6 +288,7 @@ static const struct net_device_ops rtw_netdev_ops = { .ndo_set_mac_address = rtw_net_set_mac_address, .ndo_get_stats = rtw_net_get_stats, .ndo_do_ioctl = rtw_ioctl, + .ndo_siocdevprivate = rtw_android_priv_cmd, };static const struct device_type wlan_type = {
drivers/staging/rtl8188eu/os_dep/rtw_android.c +11 -3
@@ -5,6 +5,7 @@* ******************************************************************************/ +#include <linux/compat.h> #include <linux/module.h> #include <linux/netdevice.h>
@@ -116,7 +117,8 @@ static int android_get_p2p_addr(struct net_device *net, char *command,return ETH_ALEN ; } -int rtw_android_priv_cmd (struct net_device *net,struct ifreq *ifr,int cmd) +int rtw_android_priv_cmd (struct net_device *net,struct ifreq *ifr, +void __user *data,int cmd) {int ret =0 ;char *command;
@@ -124,9 +126,15 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)int bytes_written =0 ;struct android_wifi_priv_cmd priv_cmd; -if (!ifr->ifr_data) +if (cmd !=SIOCDEVPRIVATE ) +return -EOPNOTSUPP ; + +if (in_compat_syscall ())/* to be implemented */ +return -EOPNOTSUPP ; + +if (!data)return -EINVAL ; -if (copy_from_user (&priv_cmd, ifr->ifr_data,sizeof (priv_cmd))) +if (copy_from_user (&priv_cmd, data,sizeof (priv_cmd)))return -EFAULT ;if (priv_cmd.total_len <1 )return -EINVAL ;
drivers/staging/rtl8723bs/include/osdep_intf.h +2 -0
@@ -48,6 +48,8 @@ void rtw_stop_drv_threads(struct adapter *padapter);void rtw_cancel_all_timer (struct adapter *padapter);int rtw_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +int rtw_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);int rtw_init_netdev_name (struct net_device *pnetdev,const char *ifname);struct net_device *rtw_init_netdev (struct adapter *padapter);
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +15 -3
@@ -4485,6 +4485,21 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_return err; } +int rtw_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd) +{ +struct iwreq *wrq = (struct iwreq *)rq; + +/* little hope of fixing this, better remove the whole function */ +if (in_compat_syscall ()) +return -EOPNOTSUPP ; + +if (cmd !=SIOCDEVPRIVATE ) +return -EOPNOTSUPP ; + +return rtw_ioctl_wext_private (dev, &wrq->u); +} +int rtw_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) {struct iwreq *wrq = (struct iwreq *)rq;
@@ -4497,9 +4512,6 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)case RTL_IOCTL_HOSTAPD : ret =rtw_hostapd_ioctl (dev, &wrq->u.data);break ; -case SIOCDEVPRIVATE : - ret =rtw_ioctl_wext_private (dev, &wrq->u); -break ;default : ret = -EOPNOTSUPP ;break ;
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -0
@@ -459,6 +459,7 @@ static const struct net_device_ops rtw_netdev_ops = { .ndo_set_mac_address = rtw_net_set_mac_address, .ndo_get_stats = rtw_net_get_stats, .ndo_do_ioctl = rtw_ioctl, + .ndo_siocdevprivate = rtw_siocdevprivate, };int rtw_init_netdev_name (struct net_device *pnetdev,const char *ifname)
Signature · 1 line
2.29.2
PATCH v3 3/31 staging: wlan-ng: use siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
wlan-ng has two private ioctls that correctly work in compat mode. Move these over to the new ndo_siocdevprivate mechanism.
The p80211netdev_ethtool() function is commented out and has no use here, so this can be removed
--- drivers/staging/wlan-ng/p80211netdev.c | 76 ++++---------------------- 1 file changed, 11 insertions(+), 65 deletions(-)
drivers/staging/wlan-ng/p80211netdev.c +11 -65
@@ -98,8 +98,8 @@ static int p80211knetdev_stop(struct net_device *netdev);static netdev_tx_t p80211knetdev_hard_start_xmit (struct sk_buff *skb,struct net_device *netdev);static void p80211knetdev_set_multicast_list (struct net_device *dev); -static int p80211knetdev_do_ioctl (struct net_device *dev,struct ifreq *ifr, -int cmd); +static int p80211knetdev_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static int p80211knetdev_set_mac_address (struct net_device *dev,void *addr);static void p80211knetdev_tx_timeout (struct net_device *netdev,unsigned int txqueue);static int p80211_rx_typedrop (struct wlandevice *wlandev,u16 fc);
@@ -461,56 +461,8 @@ static void p80211knetdev_set_multicast_list(struct net_device *dev) wlandev->set_multicast_list (wlandev, dev); } -#ifdef SIOCETHTOOL - -static int p80211netdev_ethtool (struct wlandevice *wlandev, -void __user *useraddr) -{ -u32 ethcmd; -struct ethtool_drvinfo info; -struct ethtool_value edata; - -memset (&info,0 ,sizeof (info)); -memset (&edata,0 ,sizeof (edata)); - -if (copy_from_user (ðcmd, useraddr,sizeof (ethcmd))) -return -EFAULT ; - -switch (ethcmd) { -case ETHTOOL_GDRVINFO : - info.cmd = ethcmd; -snprintf (info.driver,sizeof (info.driver),"p80211_%s" , - wlandev->nsdname); -snprintf (info.version,sizeof (info.version),"%s" , -WLAN_RELEASE ); - -if (copy_to_user (useraddr, &info,sizeof (info))) -return -EFAULT ; -return 0 ; -#ifdef ETHTOOL_GLINK -case ETHTOOL_GLINK : - edata.cmd = ethcmd; - -if (wlandev->linkstatus && - (wlandev->macmode !=WLAN_MACMODE_NONE )) { - edata.data =1 ; - }else { - edata.data =0 ; - } - -if (copy_to_user (useraddr, &edata,sizeof (edata))) -return -EFAULT ; -return 0 ; -#endif - } - -return -EOPNOTSUPP ; -} - -#endif -/*---------------------------------------------------------------- -* p80211knetdev_do_ioctl +* p80211knetdev_siocdevprivate * * Handle an ioctl call on one of our devices. Everything Linux * ioctl specific is done here. Then we pass the contents of the
@@ -537,8 +489,9 @@ static int p80211netdev_ethtool(struct wlandevice *wlandev,* locks. *---------------------------------------------------------------- */ -static int p80211knetdev_do_ioctl (struct net_device *dev, -struct ifreq *ifr,int cmd) +static int p80211knetdev_siocdevprivate (struct net_device *dev, +struct ifreq *ifr, +void __user *data,int cmd) {int result =0 ;struct p80211ioctl_req *req = (struct p80211ioctl_req *)ifr;
@@ -547,13 +500,8 @@ static int p80211knetdev_do_ioctl(struct net_device *dev,netdev_dbg (dev,"rx'd ioctl, cmd=%d, len=%d\n" , cmd, req->len); -#ifdef SIOCETHTOOL -if (cmd ==SIOCETHTOOL ) { - result = -p80211netdev_ethtool (wlandev, (void __user *)ifr->ifr_data); - goto bail; - } -#endif +if (in_compat_syscall ()) +return -EOPNOTSUPP ;/* Test the magic, assume ifr is good if it's there */ if (req->magic !=P80211_IOCTL_MAGIC ) {
@@ -569,7 +517,7 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, goto bail; } - msgbuf =memdup_user (req->data, req->len); + msgbuf =memdup_user (data, req->len);if (IS_ERR (msgbuf)) { result =PTR_ERR (msgbuf); goto bail;
@@ -578,10 +526,8 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, result =p80211req_dorequest (wlandev, msgbuf);if (result ==0 ) { -if (copy_to_user - (req->data, msgbuf, req->len)) { +if (copy_to_user (data, msgbuf, req->len)) result = -EFAULT ; - } }kfree (msgbuf);
@@ -682,7 +628,7 @@ static const struct net_device_ops p80211_netdev_ops = { .ndo_stop = p80211knetdev_stop, .ndo_start_xmit = p80211knetdev_hard_start_xmit, .ndo_set_rx_mode = p80211knetdev_set_multicast_list, - .ndo_do_ioctl = p80211knetdev_do_ioctl, + .ndo_siocdevprivate = p80211knetdev_siocdevprivate, .ndo_set_mac_address = p80211knetdev_set_mac_address, .ndo_tx_timeout = p80211knetdev_tx_timeout, .ndo_validate_addr = eth_validate_addr,
Signature · 1 line
2.29.2
PATCH v3 4/31 hostap: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
hostap has a combination of iwpriv ioctls that do not work at all, and two SIOCDEVPRIVATE commands that work natively but lack a compat conversion handler.
For the moment, move them over to the new ndo_siocdevprivate interface and return an error for compat mode.
--- drivers/net/wireless/intersil/hostap/hostap.h | 3 +- .../wireless/intersil/hostap/hostap_ioctl.c | 30 +++++++++++++++---- .../wireless/intersil/hostap/hostap_main.c | 3 ++ 3 files changed, 29 insertions(+), 7 deletions(-)
drivers/net/wireless/intersil/hostap/hostap.h +2 -1
@@ -93,6 +93,7 @@ extern const struct iw_handler_def hostap_iw_handler_def;extern const struct ethtool_ops prism2_ethtool_ops;int hostap_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); - +int hostap_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);#endif /* HOSTAP_H */
drivers/net/wireless/intersil/hostap/hostap_ioctl.c +24 -6
@@ -3941,7 +3941,8 @@ const struct iw_handler_def hostap_iw_handler_def = .get_wireless_stats = hostap_get_wireless_stats, }; - +/* Private ioctls (iwpriv) that have not yet been converted +* into new wireless extensions API */ int hostap_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {struct iwreq *wrq = (struct iwreq *) ifr;
@@ -3953,9 +3954,6 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) local = iface->local;switch (cmd) { -/* Private ioctls (iwpriv) that have not yet been converted -* into new wireless extensions API */ -case PRISM2_IOCTL_INQUIRE :if (!capable (CAP_NET_ADMIN )) ret = -EPERM ;else ret =prism2_ioctl_priv_inquire (dev, (int *) wrq->u.name);
@@ -4009,11 +4007,31 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) wrq->u.ap_addr.sa_data);break ;#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ +default : + ret = -EOPNOTSUPP ; +break ; + } + +return ret; +} +/* Private ioctls that are not used with iwpriv; +* in SIOCDEVPRIVATE range */ +int hostap_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) +{ +struct iwreq *wrq = (struct iwreq *)ifr; +struct hostap_interface *iface; +local_info_t *local; +int ret =0 ; -/* Private ioctls that are not used with iwpriv; -* in SIOCDEVPRIVATE range */ + iface =netdev_priv (dev); + local = iface->local; + +if (in_compat_syscall ())/* not implemented yet */ +return -EOPNOTSUPP ; +switch (cmd) {#ifdef PRISM2_DOWNLOAD_SUPPORT case PRISM2_IOCTL_DOWNLOAD :if (!capable (CAP_NET_ADMIN )) ret = -EPERM ;
drivers/net/wireless/intersil/hostap/hostap_main.c +3 -0
@@ -797,6 +797,7 @@ static const struct net_device_ops hostap_netdev_ops = { .ndo_open = prism2_open, .ndo_stop = prism2_close, .ndo_do_ioctl = hostap_ioctl, + .ndo_siocdevprivate = hostap_siocdevprivate, .ndo_set_mac_address = prism2_set_mac_address, .ndo_set_rx_mode = hostap_set_multicast_list, .ndo_tx_timeout = prism2_tx_timeout,
@@ -809,6 +810,7 @@ static const struct net_device_ops hostap_mgmt_netdev_ops = { .ndo_open = prism2_open, .ndo_stop = prism2_close, .ndo_do_ioctl = hostap_ioctl, + .ndo_siocdevprivate = hostap_siocdevprivate, .ndo_set_mac_address = prism2_set_mac_address, .ndo_set_rx_mode = hostap_set_multicast_list, .ndo_tx_timeout = prism2_tx_timeout,
@@ -821,6 +823,7 @@ static const struct net_device_ops hostap_master_ops = { .ndo_open = prism2_open, .ndo_stop = prism2_close, .ndo_do_ioctl = hostap_ioctl, + .ndo_siocdevprivate = hostap_siocdevprivate, .ndo_set_mac_address = prism2_set_mac_address, .ndo_set_rx_mode = hostap_set_multicast_list, .ndo_tx_timeout = prism2_tx_timeout,
Signature · 1 line
2.29.2
Re: [PATCH net-next v3 04/31] hostap: use ndo_siocdevprivate
(adding linux-wireless list)
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
hostap has a combination of iwpriv ioctls that do not work at all, and two SIOCDEVPRIVATE commands that work natively but lack a compat conversion handler.
Quoted 6 lines
For the moment, move them over to the new
ndo_siocdevprivateinterface and return an error for compat mode.Cc Jouni Malinen <[email protected]>Cc Kalle Valo <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH v3 5/31 bridge: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The bridge driver has an old set of ioctls using the SIOCDEVPRIVATE namespace that have never worked in compat mode and are explicitly forbidden already.
Move them over to ndo_siocdevprivate and fix compat mode for these, because we can.
--- net/bridge/br_device.c | 1 + net/bridge/br_ioctl.c | 37 +++++++++++++++++++++++++------------ net/bridge/br_private.h | 2 ++ 3 files changed, 28 insertions(+), 12 deletions(-)
net/bridge/br_device.c +1 -0
@@ -455,6 +455,7 @@ static const struct net_device_ops br_netdev_ops = { .ndo_change_rx_flags = br_dev_change_rx_flags, .ndo_change_mtu = br_change_mtu, .ndo_do_ioctl = br_dev_ioctl, + .ndo_siocdevprivate = br_dev_siocdevprivate, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_netpoll_setup = br_netpoll_setup, .ndo_netpoll_cleanup = br_netpoll_cleanup,
net/bridge/br_ioctl.c +25 -12
@@ -106,15 +106,32 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)* This interface is deprecated because it was too difficult * to do the translation for 32/64bit ioctl compatibility. */ -static int old_dev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +int br_dev_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd) {struct net_bridge *br =netdev_priv (dev);struct net_bridge_port *p =NULL ;unsigned long args[4 ]; +void __user *argp;int ret = -EOPNOTSUPP ; -if (copy_from_user (args, rq->ifr_data,sizeof (args))) -return -EFAULT ; +if (in_compat_syscall ()) { +unsigned int cargs[4 ]; + +if (copy_from_user (cargs, data,sizeof (cargs))) +return -EFAULT ; + + args[0 ] = cargs[0 ]; + args[1 ] = cargs[1 ]; + args[2 ] = cargs[2 ]; + args[3 ] = cargs[3 ]; + + argp =compat_ptr (args[1 ]); + }else { +if (copy_from_user (args, data,sizeof (args))) +return -EFAULT ; + + argp = (void __user *)args[1 ]; + }switch (args[0 ]) {case BRCTL_ADD_IF :
@@ -171,7 +188,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)return -ENOMEM ;get_port_ifindices (br, indices, num); -if (copy_to_user ((void __user *)args[1 ], indices, num*sizeof (int ))) +if (copy_to_user (argp, indices, num *sizeof (int ))) num = -EFAULT ;kfree (indices);return num;
@@ -232,7 +249,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)rcu_read_unlock (); -if (copy_to_user ((void __user *)args[1 ], &p,sizeof (p))) +if (copy_to_user (argp, &p,sizeof (p)))return -EFAULT ;return 0 ;
@@ -282,8 +299,7 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) }case BRCTL_GET_FDB_ENTRIES : -return get_fdb_entries (br, (void __user *)args[1 ], - args[2 ], args[3 ]); +return get_fdb_entries (br, argp, args[2 ], args[3 ]); }if (!ret) {
@@ -320,7 +336,7 @@ static int old_deviceless(struct net *net, void __user *uarg) args[2 ] =get_bridge_ifindices (net, indices, args[2 ]); - ret =copy_to_user ((void __user *)args[1 ], indices, args[2 ]*sizeof (int )) + ret =copy_to_user (uarg, indices, args[2 ]*sizeof (int )) ? -EFAULT : args[2 ];kfree (indices);
@@ -335,7 +351,7 @@ static int old_deviceless(struct net *net, void __user *uarg)if (!ns_capable (net->user_ns,CAP_NET_ADMIN ))return -EPERM ; -if (copy_from_user (buf, (void __user *)args[1 ],IFNAMSIZ )) +if (copy_from_user (buf, uarg,IFNAMSIZ ))return -EFAULT ; buf[IFNAMSIZ -1 ] =0 ;
@@ -383,9 +399,6 @@ int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)struct net_bridge *br =netdev_priv (dev);switch (cmd) { -case SIOCDEVPRIVATE : -return old_dev_ioctl (dev, rq, cmd); -case SIOCBRADDIF :case SIOCBRDELIF :return add_del_if (br, rq->ifr_ifindex, cmd ==SIOCBRADDIF );
net/bridge/br_private.h +2 -0
@@ -852,6 +852,8 @@ br_port_get_check_rtnl(const struct net_device *dev)/* br_ioctl.c */ int br_dev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +int br_dev_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);int br_ioctl_deviceless_stub (struct net *net,unsigned int cmd,void __user *arg);
Signature · 1 line
2.29.2
PATCH v3 6/31 phonet: use siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
phonet has a single private ioctl that is broken in compat mode on big-endian machines today because the data returned from it is never copied back to user space.
Move it over to the ndo_siocdevprivate callback, which also fixes the compat issue.
--- drivers/net/usb/cdc-phonet.c | 5 +++-- net/phonet/pn_dev.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-)
drivers/net/usb/cdc-phonet.c +3 -2
@@ -253,7 +253,8 @@ static int usbpn_close(struct net_device *dev)return usb_set_interface (pnd->usb, num, !pnd->active_setting); } -static int usbpn_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int usbpn_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {struct if_phonet_req *req = (struct if_phonet_req *)ifr;
@@ -269,7 +270,7 @@ static const struct net_device_ops usbpn_ops = { .ndo_open = usbpn_open, .ndo_stop = usbpn_close, .ndo_start_xmit = usbpn_xmit, - .ndo_do_ioctl = usbpn_ioctl, + .ndo_siocdevprivate = usbpn_siocdevprivate, };static void usbpn_setup (struct net_device *dev)
net/phonet/pn_dev.c +3 -3
@@ -233,11 +233,11 @@ static int phonet_device_autoconf(struct net_device *dev)struct if_phonet_req req;int ret; -if (!dev->netdev_ops->ndo_do_ioctl) +if (!dev->netdev_ops->ndo_siocdevprivate)return -EOPNOTSUPP ; - ret = dev->netdev_ops->ndo_do_ioctl (dev, (struct ifreq *)&req, -SIOCPNGAUTOCONF ); + ret = dev->netdev_ops->ndo_siocdevprivate (dev, (struct ifreq *)&req, +NULL ,SIOCPNGAUTOCONF );if (ret <0 )return ret;
Signature · 1 line
2.29.2
Re: [PATCH net-next v3 06/31] phonet: use siocdevprivate
Quoted 11 lines · Le tiistaina 27. heinäkuuta 2021, 16.44.52 EEST Arnd Bergmann a écrit :
From: Arnd Bergmann <[email protected]>
phonet has a single private ioctl that is broken in compat mode on big-endian machines today because the data returned from it is never copied back to user space.
Move it over to the
ndo_siocdevprivatecallback, which also fixes the compat issue.Cc Remi Denis-Courmont <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Signature · 6 lines
This made me realise that the HSI/SSI device driver lacks the private IOCTL (but that's obivously not a problem of this series). -- Rémi Denis-Courmont http://www.remlab.net/
PATCH v3 7/31 tulip: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The tulip driver has a debugging method over ioctl built-in, but it does not actually check the command type, which may end up leading to random behavior when trying to run other ioctls on it.
Change the driver to use ndo_siocdevprivate and limit the execution further to the first private command code. If anyone still has tools to run these debugging commands, they might have to be patched for it if they pass different ioctl command.
The function has existed in this form since the driver was merged in Linux-1.1.86.
--- drivers/net/ethernet/dec/tulip/de4x5.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/ethernet/dec/tulip/de4x5.c +8 -3
@@ -443,6 +443,7 @@========================================================================= */ +#include <linux/compat.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/string.h>
@@ -902,7 +903,8 @@ static int de4x5_close(struct net_device *dev);static struct net_device_stats *de4x5_get_stats (struct net_device *dev);static void de4x5_local_stats (struct net_device *dev,char *buf,int pkt_len);static void set_multicast_list (struct net_device *dev); -static int de4x5_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +static int de4x5_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);/* ** Private functions
@@ -1084,7 +1086,7 @@ static const struct net_device_ops de4x5_netdev_ops = { .ndo_start_xmit = de4x5_queue_pkt, .ndo_get_stats = de4x5_get_stats, .ndo_set_rx_mode = set_multicast_list, - .ndo_do_ioctl = de4x5_ioctl, + .ndo_siocdevprivate = de4x5_siocdevprivate, .ndo_set_mac_address= eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
@@ -5357,7 +5359,7 @@ de4x5_dbg_rx(struct sk_buff *skb, int len)** this function is only used for my testing. */ static int -de4x5_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +de4x5_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd) {struct de4x5_private *lp =netdev_priv (dev);struct de4x5_ioctl *ioc = (struct de4x5_ioctl *) &rq->ifr_ifru;
@@ -5371,6 +5373,9 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } tmp;u_long flags =0 ; +if (cmd !=SIOCDEVPRIVATE ||in_compat_syscall ()) +return -EOPNOTSUPP ; +switch (ioc->cmd) {case DE4X5_GET_HWADDR :/* Get the hardware address */ ioc->len =ETH_ALEN ;
Signature · 1 line
2.29.2
PATCH v3 8/31 bonding: use siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The bonding driver supports two command codes for each operation: one in the SIOCDEVPRIVATE range and another one with the same definition but a unique command code.
Only the second set currently works in compat mode, as the ifr_data expansion overwrites part of the ifr_slave field.
Move the private ones into ndo_siocdevprivate and change the implementation to call the other function. This makes both version work correctly.
--- drivers/net/bonding/bond_main.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
drivers/net/bonding/bond_main.c +24 -6
@@ -4000,7 +4000,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd }return 0 ; -case BOND_INFO_QUERY_OLD :case SIOCBONDINFOQUERY : u_binfo = (struct ifbond __user *)ifr->ifr_data;
@@ -4012,7 +4011,6 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmdreturn -EFAULT ;return 0 ; -case BOND_SLAVE_INFO_QUERY_OLD :case SIOCBONDSLAVEINFOQUERY : u_sinfo = (struct ifslave __user *)ifr->ifr_data;
@@ -4042,19 +4040,15 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmdreturn -ENODEV ;switch (cmd) { -case BOND_ENSLAVE_OLD :case SIOCBONDENSLAVE : res =bond_enslave (bond_dev, slave_dev,NULL );break ; -case BOND_RELEASE_OLD :case SIOCBONDRELEASE : res =bond_release (bond_dev, slave_dev);break ; -case BOND_SETHWADDR_OLD :case SIOCBONDSETHWADDR : res =bond_set_dev_addr (bond_dev, slave_dev);break ; -case BOND_CHANGE_ACTIVE_OLD :case SIOCBONDCHANGEACTIVE :bond_opt_initstr (&newval, slave_dev->name); res = __bond_opt_set_notify(bond, BOND_OPT_ACTIVE_SLAVE,
@@ -4067,6 +4061,29 @@ static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmdreturn res; } +static int bond_siocdevprivate (struct net_device *bond_dev,struct ifreq *ifr, +void __user *data,int cmd) +{ +struct ifreq ifrdata = { .ifr_data = data }; + +switch (cmd) { +case BOND_INFO_QUERY_OLD : +return bond_do_ioctl (bond_dev, &ifrdata,SIOCBONDINFOQUERY ); +case BOND_SLAVE_INFO_QUERY_OLD : +return bond_do_ioctl (bond_dev, &ifrdata,SIOCBONDSLAVEINFOQUERY ); +case BOND_ENSLAVE_OLD : +return bond_do_ioctl (bond_dev, ifr,SIOCBONDENSLAVE ); +case BOND_RELEASE_OLD : +return bond_do_ioctl (bond_dev, ifr,SIOCBONDRELEASE ); +case BOND_SETHWADDR_OLD : +return bond_do_ioctl (bond_dev, ifr,SIOCBONDSETHWADDR ); +case BOND_CHANGE_ACTIVE_OLD : +return bond_do_ioctl (bond_dev, ifr,SIOCBONDCHANGEACTIVE ); + } + +return -EOPNOTSUPP ; +} +static void bond_change_rx_flags (struct net_device *bond_dev,int change) {struct bonding *bond =netdev_priv (bond_dev);
@@ -4956,6 +4973,7 @@ static const struct net_device_ops bond_netdev_ops = { .ndo_select_queue = bond_select_queue, .ndo_get_stats64 = bond_get_stats, .ndo_do_ioctl = bond_do_ioctl, + .ndo_siocdevprivate = bond_siocdevprivate, .ndo_change_rx_flags = bond_change_rx_flags, .ndo_set_rx_mode = bond_set_rx_mode, .ndo_change_mtu = bond_change_mtu,
Signature · 1 line
2.29.2
PATCH v3 9/31 appletalk: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
appletalk has three SIOCDEVPRIVATE ioctl commands that are broken in compat mode because the passed structure contains a pointer.
Change it over to ndo_siocdevprivate for consistency and make it return an error when called in compat mode. This could be fixed if there are still users.
--- drivers/net/appletalk/ipddp.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/net/appletalk/ipddp.c +10 -6
@@ -54,11 +54,12 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb,static int ipddp_create (struct ipddp_route *new_rt);static int ipddp_delete (struct ipddp_route *rt);static struct ipddp_route *__ipddp_find_route (struct ipddp_route *rt); -static int ipddp_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +static int ipddp_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static const struct net_device_ops ipddp_netdev_ops = { .ndo_start_xmit = ipddp_xmit, - .ndo_do_ioctl = ipddp_ioctl, + .ndo_siocdevprivate = ipddp_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
@@ -268,15 +269,18 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt)return NULL ; } -static int ipddp_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int ipddp_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) { -struct ipddp_route __user *rt = ifr->ifr_data;struct ipddp_route rcp, rcp2, *rp; +if (in_compat_syscall ()) +return -EOPNOTSUPP ; +if (!capable (CAP_NET_ADMIN ))return -EPERM ; -if (copy_from_user (&rcp, rt,sizeof (rcp))) +if (copy_from_user (&rcp, data,sizeof (rcp)))return -EFAULT ; switch(cmd)
@@ -296,7 +300,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)spin_unlock_bh (&ipddp_route_lock);if (rp) { -if (copy_to_user (rt, &rcp2, +if (copy_to_user (data, &rcp2,sizeof (struct ipddp_route )))return -EFAULT ;return 0 ;
Signature · 1 line
2.29.2
PATCH v3 10/31 hamachi: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
hamachi has one command that overloads the ifreq argument and requires a conversion to ndo_siocdevprivate in order to make compat mode work, so split it from ndo_ioctl.
--- drivers/net/ethernet/packetengines/hamachi.c | 63 ++++++++++++-------- 1 file changed, 38 insertions(+), 25 deletions(-)
drivers/net/ethernet/packetengines/hamachi.c +38 -25
@@ -546,7 +546,9 @@ static int read_eeprom(void __iomem *ioaddr, int location);static int mdio_read (struct net_device *dev,int phy_id,int location);static void mdio_write (struct net_device *dev,int phy_id,int location,int value);static int hamachi_open (struct net_device *dev); -static int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +static int hamachi_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +static int hamachi_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);static void hamachi_timer (struct timer_list *t);static void hamachi_tx_timeout (struct net_device *dev,unsigned int txqueue);static void hamachi_init_ring (struct net_device *dev);
@@ -571,7 +573,8 @@ static const struct net_device_ops hamachi_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_tx_timeout = hamachi_tx_timeout, - .ndo_do_ioctl = netdev_ioctl, + .ndo_do_ioctl = hamachi_ioctl, + .ndo_siocdevprivate = hamachi_siocdevprivate, };
@@ -1867,7 +1870,36 @@ static const struct ethtool_ops ethtool_ops_no_mii = { .get_drvinfo = hamachi_get_drvinfo, }; -static int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +/* private ioctl: set rx,tx intr params */ +static int hamachi_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd) +{ +struct hamachi_private *np =netdev_priv (dev); +u32 *d = (u32 *)&rq->ifr_ifru; + +if (!netif_running (dev)) +return -EINVAL ; + +if (cmd !=SIOCDEVPRIVATE +3 ) +return -EOPNOTSUPP ; + +/* Should add this check here or an ordinary user can do nasty +* things. -KDU +* +* TODO: Shut down the Rx and Tx engines while doing this. +*/ +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; +writel (d[0 ], np->base + TxIntrCtrl); +writel (d[1 ], np->base + RxIntrCtrl); +printk (KERN_NOTICE "%s: tx %08x, rx %08x intr\n" , dev->name, + (u32 )readl (np->base + TxIntrCtrl), + (u32 )readl (np->base + RxIntrCtrl)); + +return 0 ; +} + +static int hamachi_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) {struct hamachi_private *np =netdev_priv (dev);struct mii_ioctl_data *data =if_mii (rq);
@@ -1876,28 +1908,9 @@ static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)if (!netif_running (dev))return -EINVAL ; -if (cmd == (SIOCDEVPRIVATE +3 )) {/* set rx,tx intr params */ -u32 *d = (u32 *)&rq->ifr_ifru; -/* Should add this check here or an ordinary user can do nasty -* things. -KDU -* -* TODO: Shut down the Rx and Tx engines while doing this. -*/ -if (!capable (CAP_NET_ADMIN )) -return -EPERM ; -writel (d[0 ], np->base + TxIntrCtrl); -writel (d[1 ], np->base + RxIntrCtrl); -printk (KERN_NOTICE "%s: tx %08x, rx %08x intr\n" , dev->name, - (u32 )readl (np->base + TxIntrCtrl), - (u32 )readl (np->base + RxIntrCtrl)); - rc =0 ; - } - -else { -spin_lock_irq (&np->lock); - rc =generic_mii_ioctl (&np->mii_if, data, cmd,NULL ); -spin_unlock_irq (&np->lock); - } +spin_lock_irq (&np->lock); + rc =generic_mii_ioctl (&np->mii_if, data, cmd,NULL ); +spin_unlock_irq (&np->lock);return rc; }
Signature · 1 line
2.29.2
PATCH v3 11/31 tehuti: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Tehuti only implements private ioctl commands, and implements them by overriding the ifreq layout, which is broken in compat mode.
Move it to the ndo_siocdevprivate callback in order to fix this.
--- drivers/net/ethernet/tehuti/tehuti.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
drivers/net/ethernet/tehuti/tehuti.c +5 -13
@@ -637,7 +637,8 @@ static int bdx_range_check(struct bdx_priv *priv, u32 offset) -EINVAL : 0; } -static int bdx_ioctl_priv (struct net_device *ndev,struct ifreq *ifr,int cmd) +static int bdx_siocdevprivate (struct net_device *ndev,struct ifreq *ifr, +void __user *udata,int cmd) {struct bdx_priv *priv =netdev_priv (ndev);u32 data[3 ];
@@ -647,7 +648,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)DBG ("jiffies=%ld cmd=%d\n" , jiffies, cmd);if (cmd !=SIOCDEVPRIVATE ) { - error =copy_from_user (data, ifr->ifr_data,sizeof (data)); + error =copy_from_user (data, udata,sizeof (data));if (error) {pr_err ("can't copy from user\n" );RET (-EFAULT );
@@ -669,7 +670,7 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd) data[2 ] =READ_REG (priv, data[1 ]);DBG ("read_reg(0x%x)=0x%x (dec %d)\n" , data[1 ], data[2 ], data[2 ]); - error =copy_to_user (ifr->ifr_data, data,sizeof (data)); + error =copy_to_user (udata, data,sizeof (data));if (error)RET (-EFAULT );break ;
@@ -688,15 +689,6 @@ static int bdx_ioctl_priv(struct net_device *ndev, struct ifreq *ifr, int cmd)return 0 ; } -static int bdx_ioctl (struct net_device *ndev,struct ifreq *ifr,int cmd) -{ -ENTER ; -if (cmd >=SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE +15 )) -RET (bdx_ioctl_priv (ndev, ifr, cmd)); -else -RET (-EOPNOTSUPP ); -} -/** * __bdx_vlan_rx_vid - private helper for adding/killing VLAN vid * @ndev: network device
@@ -1860,7 +1852,7 @@ static const struct net_device_ops bdx_netdev_ops = { .ndo_stop = bdx_close, .ndo_start_xmit = bdx_tx_transmit, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = bdx_ioctl, + .ndo_siocdevprivate = bdx_siocdevprivate, .ndo_set_rx_mode = bdx_setmulti, .ndo_change_mtu = bdx_change_mtu, .ndo_set_mac_address = bdx_set_mac,
Signature · 1 line
2.29.2
PATCH v3 12/31 eql: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The private ioctls in eql pass the arguments correctly through ifr_data, but the slaving_request_t and slave_config_t structures are incompatible with compat mode and need special conversion code in the driver.
Convert to siocdevprivate for now, and return an error when called in compat mode.
--- drivers/net/eql.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
drivers/net/eql.c +15 -9
@@ -113,6 +113,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/compat.h> #include <linux/capability.h> #include <linux/module.h> #include <linux/kernel.h>
@@ -131,7 +132,8 @@static int eql_open (struct net_device *dev);static int eql_close (struct net_device *dev); -static int eql_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +static int eql_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static netdev_tx_t eql_slave_xmit (struct sk_buff *skb,struct net_device *dev);#define eql_is_slave (dev) ((dev->flags & IFF_SLAVE) == IFF_SLAVE)
@@ -170,7 +172,7 @@ static const char version[] __initconst =static const struct net_device_ops eql_netdev_ops = { .ndo_open = eql_open, .ndo_stop = eql_close, - .ndo_do_ioctl = eql_ioctl, + .ndo_siocdevprivate = eql_siocdevprivate, .ndo_start_xmit = eql_slave_xmit, };
@@ -268,25 +270,29 @@ static int eql_s_slave_cfg(struct net_device *dev, slave_config_t __user *sc);static int eql_g_master_cfg (struct net_device *dev,master_config_t __user *mc);static int eql_s_master_cfg (struct net_device *dev,master_config_t __user *mc); -static int eql_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int eql_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {if (cmd !=EQL_GETMASTRCFG && cmd !=EQL_GETSLAVECFG && !capable (CAP_NET_ADMIN ))return -EPERM ; +if (in_compat_syscall ())/* to be implemented */ +return -EOPNOTSUPP ; +switch (cmd) {case EQL_ENSLAVE : -return eql_enslave (dev, ifr->ifr_data); +return eql_enslave (dev, data);case EQL_EMANCIPATE : -return eql_emancipate (dev, ifr->ifr_data); +return eql_emancipate (dev, data);case EQL_GETSLAVECFG : -return eql_g_slave_cfg (dev, ifr->ifr_data); +return eql_g_slave_cfg (dev, data);case EQL_SETSLAVECFG : -return eql_s_slave_cfg (dev, ifr->ifr_data); +return eql_s_slave_cfg (dev, data);case EQL_GETMASTRCFG : -return eql_g_master_cfg (dev, ifr->ifr_data); +return eql_g_master_cfg (dev, data);case EQL_SETMASTRCFG : -return eql_s_master_cfg (dev, ifr->ifr_data); +return eql_s_master_cfg (dev, data);default :return -EOPNOTSUPP ; }
Signature · 1 line
2.29.2
PATCH v3 13/31 fddi: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The skfddi driver has a private ioctl and passes the data correctly through ifr_data, but the use of a pointer in s_skfp_ioctl is broken in compat mode.
Change the driver to use ndo_siocdevprivate and disallow calling it in compat mode until a conversion handler is added.
--- drivers/net/fddi/skfp/skfddi.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/net/fddi/skfp/skfddi.c +12 -7
@@ -70,6 +70,7 @@ static const char * const boot_msg =/* Include files */ #include <linux/capability.h> +#include <linux/compat.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/errno.h>
@@ -103,7 +104,8 @@ static struct net_device_stats *skfp_ctl_get_stats(struct net_device *dev);static void skfp_ctl_set_multicast_list (struct net_device *dev);static void skfp_ctl_set_multicast_list_wo_lock (struct net_device *dev);static int skfp_ctl_set_mac_address (struct net_device *dev,void *addr); -static int skfp_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +static int skfp_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);static netdev_tx_t skfp_send_pkt (struct sk_buff *skb,struct net_device *dev);static void send_queued_packets (struct s_smc *smc);
@@ -164,7 +166,7 @@ static const struct net_device_ops skfp_netdev_ops = { .ndo_get_stats = skfp_ctl_get_stats, .ndo_set_rx_mode = skfp_ctl_set_multicast_list, .ndo_set_mac_address = skfp_ctl_set_mac_address, - .ndo_do_ioctl = skfp_ioctl, + .ndo_siocdevprivate = skfp_siocdevprivate, };/*
@@ -932,9 +934,9 @@ static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr)/* -* ============== -* = skfp_ioctl = -* ============== +* ======================= +* = skfp_siocdevprivate = +* ======================= * * Overview: *
@@ -954,16 +956,19 @@ static int skfp_ctl_set_mac_address(struct net_device *dev, void *addr)*/ -static int skfp_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +static int skfp_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd) {struct s_smc *smc =netdev_priv (dev);skfddi_priv *lp = &smc->os;struct s_skfp_ioctl ioc;int status =0 ; -if (copy_from_user (&ioc, rq->ifr_data,sizeof (struct s_skfp_ioctl ))) +if (copy_from_user (&ioc, data,sizeof (struct s_skfp_ioctl )))return -EFAULT ; +if (in_compat_syscall ()) +return -EOPNOTSUPP ; +switch (ioc.cmd) {case SKFP_GET_STATS :/* Get the driver statistics */ ioc.len =sizeof (lp->MacStat);
Signature · 1 line
2.29.2
PATCH v3 14/31 net: usb: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The pegasus and rtl8150 drivers use SIOCDEVPRIVATE ioctls to access their MII registers, in place of the normal commands. This is broken for all compat ioctls today.
Change to ndo_siocdevprivate to fix it.
--- drivers/net/usb/pegasus.c | 5 +++-- drivers/net/usb/rtl8150.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/net/usb/pegasus.c +3 -2
@@ -987,7 +987,8 @@ static const struct ethtool_ops ops = { .set_link_ksettings = pegasus_set_link_ksettings, }; -static int pegasus_ioctl (struct net_device *net,struct ifreq *rq,int cmd) +static int pegasus_siocdevprivate (struct net_device *net,struct ifreq *rq, +void __user *udata,int cmd) {__u16 *data = (__u16 *) &rq->ifr_ifru;pegasus_t *pegasus =netdev_priv (net);
@@ -1245,7 +1246,7 @@ static int pegasus_resume(struct usb_interface *intf)static const struct net_device_ops pegasus_netdev_ops = { .ndo_open = pegasus_open, .ndo_stop = pegasus_close, - .ndo_do_ioctl = pegasus_ioctl, + .ndo_siocdevprivate = pegasus_siocdevprivate, .ndo_start_xmit = pegasus_start_xmit, .ndo_set_rx_mode = pegasus_set_multicast, .ndo_tx_timeout = pegasus_tx_timeout,
drivers/net/usb/rtl8150.c +3 -2
@@ -822,7 +822,8 @@ static const struct ethtool_ops ops = { .get_link_ksettings = rtl8150_get_link_ksettings, }; -static int rtl8150_ioctl (struct net_device *netdev,struct ifreq *rq,int cmd) +static int rtl8150_siocdevprivate (struct net_device *netdev,struct ifreq *rq, +void __user *udata,int cmd) {rtl8150_t *dev =netdev_priv (netdev);u16 *data = (u16 *) & rq->ifr_ifru;
@@ -850,7 +851,7 @@ static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)static const struct net_device_ops rtl8150_netdev_ops = { .ndo_open = rtl8150_open, .ndo_stop = rtl8150_close, - .ndo_do_ioctl = rtl8150_ioctl, + .ndo_siocdevprivate = rtl8150_siocdevprivate, .ndo_start_xmit = rtl8150_start_xmit, .ndo_tx_timeout = rtl8150_tx_timeout, .ndo_set_rx_mode = rtl8150_set_multicast,
Signature · 1 line
2.29.2
Petko Manolov
maintainerRe: [PATCH net-next v3 14/31] net: usb: use ndo_siocdevprivate
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The pegasus and rtl8150 drivers use SIOCDEVPRIVATE ioctls to access their MII registers, in place of the normal commands. This is broken for all compat ioctls today.
Change to
ndo_siocdevprivateto fix it.
Well, ACK i guess... :)
Petko
Quoted 58 lines
Cc Petko Manolov <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>--- drivers/net/usb/pegasus.c | 5 +++-- drivers/net/usb/rtl8150.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)drivers/net/usb/pegasus.c +3
-2@@ -987,7 +987,8 @@ static const struct ethtool_ops ops = { .set_link_ksettings = pegasus_set_link_ksettings, }; -static int pegasus_ioctl (struct net_device *net,struct ifreq *rq,int cmd) +static int pegasus_siocdevprivate (struct net_device *net,struct ifreq *rq, +void __user *udata,int cmd) {__u16 *data = (__u16 *) &rq->ifr_ifru;pegasus_t *pegasus =netdev_priv (net);@@ -1245,7 +1246,7 @@ static int pegasus_resume(struct usb_interface *intf)static const struct net_device_ops pegasus_netdev_ops = { .ndo_open = pegasus_open, .ndo_stop = pegasus_close, - .ndo_do_ioctl = pegasus_ioctl, + .ndo_siocdevprivate = pegasus_siocdevprivate, .ndo_start_xmit = pegasus_start_xmit, .ndo_set_rx_mode = pegasus_set_multicast, .ndo_tx_timeout = pegasus_tx_timeout,drivers/net/usb/rtl8150.c +3
-2@@ -822,7 +822,8 @@ static const struct ethtool_ops ops = { .get_link_ksettings = rtl8150_get_link_ksettings, }; -static int rtl8150_ioctl (struct net_device *netdev,struct ifreq *rq,int cmd) +static int rtl8150_siocdevprivate (struct net_device *netdev,struct ifreq *rq, +void __user *udata,int cmd) {rtl8150_t *dev =netdev_priv (netdev);u16 *data = (u16 *) & rq->ifr_ifru;@@ -850,7 +851,7 @@ static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)static const struct net_device_ops rtl8150_netdev_ops = { .ndo_open = rtl8150_open, .ndo_stop = rtl8150_close, - .ndo_do_ioctl = rtl8150_ioctl, + .ndo_siocdevprivate = rtl8150_siocdevprivate, .ndo_start_xmit = rtl8150_start_xmit, .ndo_tx_timeout = rtl8150_tx_timeout, .ndo_set_rx_mode = rtl8150_set_multicast,Signature · 1 line
2.29.2
PATCH v3 15/31 slip/plip: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
slip and plip both use a couple of SIOCDEVPRIVATE ioctl commands that overload the ifreq layout in a way that is incompatible with compat mode.
Convert to use ndo_siocdevprivate to allow passing the data this way, but return an error in compat mode anyway because the private structure is still incompatible.
This could be fixed as well to make compat work properly.
--- drivers/net/plip/plip.c | 12 +++++++++--- drivers/net/slip/slip.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-)
drivers/net/plip/plip.c +9 -3
@@ -84,6 +84,7 @@ static const char version[] = "NET3 PLIP version 2.4-parport [email protected]\n"extra grounds are 18,19,20,21,22,23,24 */ +#include <linux/compat.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/types.h>
@@ -150,7 +151,8 @@ static int plip_hard_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type);static int plip_open (struct net_device *dev);static int plip_close (struct net_device *dev); -static int plip_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +static int plip_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static int plip_preempt (void *handle);static void plip_wakeup (void *handle);
@@ -265,7 +267,7 @@ static const struct net_device_ops plip_netdev_ops = { .ndo_open = plip_open, .ndo_stop = plip_close, .ndo_start_xmit = plip_tx_packet, - .ndo_do_ioctl = plip_ioctl, + .ndo_siocdevprivate = plip_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
@@ -1207,7 +1209,8 @@ plip_wakeup(void *handle) }static int -plip_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +plip_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd) {struct net_local *nl =netdev_priv (dev);struct plipconf *pc = (struct plipconf *) &rq->ifr_ifru;
@@ -1215,6 +1218,9 @@ plip_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)if (cmd !=SIOCDEVPLIP )return -EOPNOTSUPP ; +if (in_compat_syscall ()) +return -EOPNOTSUPP ; +switch (pc->pcmd) {case PLIP_GET_TIMEOUT : pc->trigger = nl->trigger;
drivers/net/slip/slip.c +9 -4
@@ -62,6 +62,7 @@*/ #define SL_CHECK_TRANSMIT +#include <linux/compat.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -108,7 +109,7 @@ static void slip_unesc6(struct slip *sl, unsigned char c);#ifdef CONFIG_SLIP_SMART static void sl_keepalive (struct timer_list *t);static void sl_outfill (struct timer_list *t); -static int sl_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +static int sl_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd);#endif /********************************
@@ -647,7 +648,7 @@ static const struct net_device_ops sl_netdev_ops = { .ndo_change_mtu = sl_change_mtu, .ndo_tx_timeout = sl_tx_timeout, #ifdef CONFIG_SLIP_SMART - .ndo_do_ioctl = sl_ioctl, + .ndo_siocdevprivate = sl_siocdevprivate,#endif };
@@ -1179,11 +1180,12 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file,/* VSV changes start here */ #ifdef CONFIG_SLIP_SMART -/* function do_ioctl called from net/core/dev.c +/* function sl_siocdevprivate called from net/core/dev.c to allow get/set outfill/keepalive parameter by ifconfig */ -static int sl_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +static int sl_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd) {struct slip *sl =netdev_priv (dev);unsigned long *p = (unsigned long *)&rq->ifr_ifru;
@@ -1191,6 +1193,9 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)if (sl ==NULL )/* Allocation failed ?? */ return -ENODEV ; +if (in_compat_syscall ()) +return -EOPNOTSUPP ; +spin_lock_bh (&sl->lock);if (!sl->tty) {
Signature · 1 line
2.29.2
PATCH v3 16/31 qeth: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
qeth has both standard MII ioctls and custom SIOCDEVPRIVATE ones, all of which work correctly with compat user space.
Move the private ones over to the new ndo_siocdevprivate callback.
--- drivers/s390/net/qeth_core.h | 5 ++++- drivers/s390/net/qeth_core_main.c | 35 ++++++++++++++++++++++--------- drivers/s390/net/qeth_l2_main.c | 1 + drivers/s390/net/qeth_l3_main.c | 8 ++++--- 4 files changed, 35 insertions(+), 14 deletions(-)
drivers/s390/net/qeth_core.h +4 -1
@@ -771,7 +771,8 @@ struct qeth_discipline {void (*remove) (struct ccwgroup_device *);int (*set_online)(struct qeth_card *card,bool carrier_ok);void (*set_offline)(struct qeth_card *card); -int (*do_ioctl)(struct net_device *dev,struct ifreq *rq,int cmd); +int (*do_ioctl)(struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);int (*control_event_handler)(struct qeth_card *card,struct qeth_ipa_cmd *cmd); };
@@ -1085,6 +1086,8 @@ int qeth_setadpparms_set_access_ctrl(struct qeth_card *card, enum qeth_ipa_isolation_modes mode);int qeth_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +int qeth_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd);void qeth_dbf_longtext (debug_info_t *id,int level,char *text, ...);int qeth_configure_cq (struct qeth_card *,enum qeth_cq );int qeth_hw_trap (struct qeth_card *,enum qeth_diags_trap_action );
drivers/s390/net/qeth_core_main.c +25 -10
@@ -6590,21 +6590,42 @@ static struct ccwgroup_driver qeth_core_ccwgroup_driver = { .shutdown = qeth_core_shutdown, }; -int qeth_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +int qeth_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd) {struct qeth_card *card = dev->ml_priv; -struct mii_ioctl_data *mii_data;int rc =0 ;switch (cmd) {case SIOC_QETH_ADP_SET_SNMP_CONTROL : - rc =qeth_snmp_command (card, rq->ifr_ifru.ifru_data); + rc =qeth_snmp_command (card, data);break ;case SIOC_QETH_GET_CARD_TYPE :if ((IS_OSD (card) ||IS_OSM (card) ||IS_OSX (card)) && !IS_VM_NIC (card))return 1 ;return 0 ; +case SIOC_QETH_QUERY_OAT : + rc =qeth_query_oat_command (card, data); +break ; +default : +if (card->discipline->do_ioctl) + rc = card->discipline->do_ioctl (dev, rq, data, cmd); +else + rc = -EOPNOTSUPP ; + } +if (rc) +QETH_CARD_TEXT_ (card,2 ,"ioce%x" , rc); +return rc; +} +EXPORT_SYMBOL_GPL (qeth_siocdevprivate); + +int qeth_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +{ +struct qeth_card *card = dev->ml_priv; +struct mii_ioctl_data *mii_data; +int rc =0 ; + +switch (cmd) {case SIOCGMIIPHY : mii_data =if_mii (rq); mii_data->phy_id =0 ;
@@ -6617,14 +6638,8 @@ int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) mii_data->val_out =qeth_mdio_read (dev, mii_data->phy_id, mii_data->reg_num);break ; -case SIOC_QETH_QUERY_OAT : - rc =qeth_query_oat_command (card, rq->ifr_ifru.ifru_data); -break ;default : -if (card->discipline->do_ioctl) - rc = card->discipline->do_ioctl (dev, rq, cmd); -else - rc = -EOPNOTSUPP ; +return -EOPNOTSUPP ; }if (rc)QETH_CARD_TEXT_ (card,2 ,"ioce%x" , rc);
drivers/s390/net/qeth_l2_main.c +1 -0
@@ -837,6 +837,7 @@ static const struct net_device_ops qeth_l2_netdev_ops = { .ndo_validate_addr = qeth_l2_validate_addr, .ndo_set_rx_mode = qeth_l2_set_rx_mode, .ndo_do_ioctl = qeth_do_ioctl, + .ndo_siocdevprivate = qeth_siocdevprivate, .ndo_set_mac_address = qeth_l2_set_mac_address, .ndo_vlan_rx_add_vid = qeth_l2_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = qeth_l2_vlan_rx_kill_vid,
drivers/s390/net/qeth_l3_main.c +5 -3
@@ -1512,7 +1512,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)return rc; } -static int qeth_l3_do_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +static int qeth_l3_do_ioctl (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd) {struct qeth_card *card = dev->ml_priv;struct qeth_arp_cache_entry arp_entry;
@@ -1532,13 +1532,13 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) rc = -EPERM ;break ; } - rc =qeth_l3_arp_query (card, rq->ifr_ifru.ifru_data); + rc =qeth_l3_arp_query (card, data);break ;case SIOC_QETH_ARP_ADD_ENTRY :case SIOC_QETH_ARP_REMOVE_ENTRY :if (!capable (CAP_NET_ADMIN ))return -EPERM ; -if (copy_from_user (&arp_entry, rq->ifr_data,sizeof (arp_entry))) +if (copy_from_user (&arp_entry, data,sizeof (arp_entry)))return -EFAULT ; arp_cmd = (cmd == SIOC_QETH_ARP_ADD_ENTRY) ?
@@ -1842,6 +1842,7 @@ static const struct net_device_ops qeth_l3_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = qeth_l3_set_rx_mode, .ndo_do_ioctl = qeth_do_ioctl, + .ndo_siocdevprivate = qeth_siocdevprivate, .ndo_fix_features = qeth_fix_features, .ndo_set_features = qeth_set_features, .ndo_tx_timeout = qeth_tx_timeout,
@@ -1857,6 +1858,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = qeth_l3_set_rx_mode, .ndo_do_ioctl = qeth_do_ioctl, + .ndo_siocdevprivate = qeth_siocdevprivate, .ndo_fix_features = qeth_fix_features, .ndo_set_features = qeth_set_features, .ndo_tx_timeout = qeth_tx_timeout,
Signature · 1 line
2.29.2
PATCH v3 17/31 cxgb3: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
cxgb3 has a private multiplexor that works correctly in compat mode, split out the siocdevprivate callback from do_ioctl for simplification.
--- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +8 -4
@@ -2135,13 +2135,18 @@ static int in_range(int val, int lo, int hi)return val <0 || (val <= hi && val >= lo); } -static int cxgb_extension_ioctl (struct net_device *dev,void __user *useraddr) +static int cxgb_siocdevprivate (struct net_device *dev, +struct ifreq *ifreq, +void __user *useraddr, +int cmd) {struct port_info *pi =netdev_priv (dev);struct adapter *adapter = pi->adapter; -u32 cmd;int ret; +if (cmd !=SIOCCHIOCTL ) +return -EOPNOTSUPP ; +if (copy_from_user (&cmd, useraddr,sizeof (cmd)))return -EFAULT ;
@@ -2546,8 +2551,6 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd) fallthrough;case SIOCGMIIPHY :return mdio_mii_ioctl (&pi->phy.mdio, data, cmd); -case SIOCCHIOCTL : -return cxgb_extension_ioctl (dev, req->ifr_data);default :return -EOPNOTSUPP ; }
@@ -3182,6 +3185,7 @@ static const struct net_device_ops cxgb_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = cxgb_set_rxmode, .ndo_do_ioctl = cxgb_ioctl, + .ndo_siocdevprivate = cxgb_siocdevprivate, .ndo_change_mtu = cxgb_change_mtu, .ndo_set_mac_address = cxgb_set_mac_addr, .ndo_fix_features = cxgb_fix_features,
Signature · 1 line
2.29.2
PATCH v3 18/31 hamradio: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
hamradio uses a set of private ioctls that do seem to work correctly in compat mode, as they only rely on the ifr_data pointer.
Move them over to the ndo_siocdevprivate callback as a cleanup.
--- drivers/net/hamradio/baycom_epp.c | 9 +++++---- drivers/net/hamradio/baycom_par.c | 12 ++++++------ drivers/net/hamradio/baycom_ser_fdx.c | 12 ++++++------ drivers/net/hamradio/baycom_ser_hdx.c | 12 ++++++------ drivers/net/hamradio/bpqether.c | 9 +++++---- drivers/net/hamradio/dmascc.c | 18 ++++++++---------- drivers/net/hamradio/hdlcdrv.c | 20 +++++++++++--------- drivers/net/hamradio/scc.c | 13 ++++++++----- drivers/net/hamradio/yam.c | 19 +++++++++---------- include/linux/hdlcdrv.h | 2 +- 10 files changed, 65 insertions(+), 61 deletions(-)
drivers/net/hamradio/baycom_epp.c +5 -4
@@ -1005,7 +1005,8 @@ static int baycom_setmode(struct baycom_state *bc, const char *modestr)/* --------------------------------------------------------------------- */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int baycom_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {struct baycom_state *bc =netdev_priv (dev);struct hdlcdrv_ioctl hi;
@@ -1013,7 +1014,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (cmd !=SIOCDEVPRIVATE )return -ENOIOCTLCMD ; -if (copy_from_user (&hi, ifr->ifr_data,sizeof (hi))) +if (copy_from_user (&hi, data,sizeof (hi)))return -EFAULT ;switch (hi.cmd) {default :
@@ -1104,7 +1105,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return HDLCDRV_PARMASK_IOBASE ; } -if (copy_to_user (ifr->ifr_data, &hi,sizeof (hi))) +if (copy_to_user (data, &hi,sizeof (hi)))return -EFAULT ;return 0 ; }
@@ -1114,7 +1115,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)static const struct net_device_ops baycom_netdev_ops = { .ndo_open = epp_open, .ndo_stop = epp_close, - .ndo_do_ioctl = baycom_ioctl, + .ndo_siocdevprivate = baycom_siocdevprivate, .ndo_start_xmit = baycom_send_packet, .ndo_set_mac_address = baycom_set_mac_address, };
drivers/net/hamradio/baycom_par.c +6 -6
@@ -380,7 +380,7 @@ static int par96_close(struct net_device *dev)* ===================== hdlcdrv driver interface ========================= */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr, +static int baycom_ioctl (struct net_device *dev,void __user *data,struct hdlcdrv_ioctl *hi,int cmd);/* --------------------------------------------------------------------- */
@@ -408,7 +408,7 @@ static int baycom_setmode(struct baycom_state *bc, const char *modestr)/* --------------------------------------------------------------------- */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr, +static int baycom_ioctl (struct net_device *dev,void __user *data,struct hdlcdrv_ioctl *hi,int cmd) {struct baycom_state *bc;
@@ -428,7 +428,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,case HDLCDRVCTL_GETMODE :strcpy (hi->data.modename, bc->options ?"par96" :"picpar" ); -if (copy_to_user (ifr->ifr_data, hi,sizeof (struct hdlcdrv_ioctl ))) +if (copy_to_user (data, hi,sizeof (struct hdlcdrv_ioctl )))return -EFAULT ;return 0 ;
@@ -440,7 +440,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,case HDLCDRVCTL_MODELIST :strcpy (hi->data.modename,"par96,picpar" ); -if (copy_to_user (ifr->ifr_data, hi,sizeof (struct hdlcdrv_ioctl ))) +if (copy_to_user (data, hi,sizeof (struct hdlcdrv_ioctl )))return -EFAULT ;return 0 ;
@@ -449,7 +449,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, } -if (copy_from_user (&bi, ifr->ifr_data,sizeof (bi))) +if (copy_from_user (&bi, data,sizeof (bi)))return -EFAULT ;switch (bi.cmd) {default :
@@ -464,7 +464,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,#endif /* BAYCOM_DEBUG */ } -if (copy_to_user (ifr->ifr_data, &bi,sizeof (bi))) +if (copy_to_user (data, &bi,sizeof (bi)))return -EFAULT ;return 0 ;
drivers/net/hamradio/baycom_ser_fdx.c +6 -6
@@ -462,7 +462,7 @@ static int ser12_close(struct net_device *dev)/* --------------------------------------------------------------------- */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr, +static int baycom_ioctl (struct net_device *dev,void __user *data,struct hdlcdrv_ioctl *hi,int cmd);/* --------------------------------------------------------------------- */
@@ -497,7 +497,7 @@ static int baycom_setmode(struct baycom_state *bc, const char *modestr)/* --------------------------------------------------------------------- */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr, +static int baycom_ioctl (struct net_device *dev,void __user *data,struct hdlcdrv_ioctl *hi,int cmd) {struct baycom_state *bc;
@@ -519,7 +519,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,sprintf (hi->data.modename,"ser%u" , bc->baud /100 );if (bc->opt_dcd <=0 )strcat (hi->data.modename, (!bc->opt_dcd) ?"*" :"+" ); -if (copy_to_user (ifr->ifr_data, hi,sizeof (struct hdlcdrv_ioctl ))) +if (copy_to_user (data, hi,sizeof (struct hdlcdrv_ioctl )))return -EFAULT ;return 0 ;
@@ -531,7 +531,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,case HDLCDRVCTL_MODELIST :strcpy (hi->data.modename,"ser12,ser3,ser24" ); -if (copy_to_user (ifr->ifr_data, hi,sizeof (struct hdlcdrv_ioctl ))) +if (copy_to_user (data, hi,sizeof (struct hdlcdrv_ioctl )))return -EFAULT ;return 0 ;
@@ -540,7 +540,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, } -if (copy_from_user (&bi, ifr->ifr_data,sizeof (bi))) +if (copy_from_user (&bi, data,sizeof (bi)))return -EFAULT ;switch (bi.cmd) {default :
@@ -555,7 +555,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,#endif /* BAYCOM_DEBUG */ } -if (copy_to_user (ifr->ifr_data, &bi,sizeof (bi))) +if (copy_to_user (data, &bi,sizeof (bi)))return -EFAULT ;return 0 ;
drivers/net/hamradio/baycom_ser_hdx.c +6 -6
@@ -521,7 +521,7 @@ static int ser12_close(struct net_device *dev)/* --------------------------------------------------------------------- */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr, +static int baycom_ioctl (struct net_device *dev,void __user *data,struct hdlcdrv_ioctl *hi,int cmd);/* --------------------------------------------------------------------- */
@@ -551,7 +551,7 @@ static int baycom_setmode(struct baycom_state *bc, const char *modestr)/* --------------------------------------------------------------------- */ -static int baycom_ioctl (struct net_device *dev,struct ifreq *ifr, +static int baycom_ioctl (struct net_device *dev,void __user *data,struct hdlcdrv_ioctl *hi,int cmd) {struct baycom_state *bc;
@@ -573,7 +573,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,strcpy (hi->data.modename,"ser12" );if (bc->opt_dcd <=0 )strcat (hi->data.modename, (!bc->opt_dcd) ?"*" : (bc->opt_dcd ==-2 ) ?"@" :"+" ); -if (copy_to_user (ifr->ifr_data, hi,sizeof (struct hdlcdrv_ioctl ))) +if (copy_to_user (data, hi,sizeof (struct hdlcdrv_ioctl )))return -EFAULT ;return 0 ;
@@ -585,7 +585,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,case HDLCDRVCTL_MODELIST :strcpy (hi->data.modename,"ser12" ); -if (copy_to_user (ifr->ifr_data, hi,sizeof (struct hdlcdrv_ioctl ))) +if (copy_to_user (data, hi,sizeof (struct hdlcdrv_ioctl )))return -EFAULT ;return 0 ;
@@ -594,7 +594,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, } -if (copy_from_user (&bi, ifr->ifr_data,sizeof (bi))) +if (copy_from_user (&bi, data,sizeof (bi)))return -EFAULT ;switch (bi.cmd) {default :
@@ -609,7 +609,7 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr,#endif /* BAYCOM_DEBUG */ } -if (copy_to_user (ifr->ifr_data, &bi,sizeof (bi))) +if (copy_to_user (data, &bi,sizeof (bi)))return -EFAULT ;return 0 ;
drivers/net/hamradio/bpqether.c +5 -4
@@ -314,9 +314,10 @@ static int bpq_set_mac_address(struct net_device *dev, void *addr)* source ethernet address (broadcast * or multicast: accept all) */ -static int bpq_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int bpq_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) { -struct bpq_ethaddr __user *ethaddr = ifr->ifr_data; +struct bpq_ethaddr __user *ethaddr = data;struct bpqdev *bpq =netdev_priv (dev);struct bpq_req req;
@@ -325,7 +326,7 @@ static int bpq_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)switch (cmd) {case SIOCSBPQETHOPT : -if (copy_from_user (&req, ifr->ifr_data,sizeof (struct bpq_req ))) +if (copy_from_user (&req, data,sizeof (struct bpq_req )))return -EFAULT ;switch (req.cmd) {case SIOCGBPQETHPARAM :
@@ -448,7 +449,7 @@ static const struct net_device_ops bpq_netdev_ops = { .ndo_stop = bpq_close, .ndo_start_xmit = bpq_xmit, .ndo_set_mac_address = bpq_set_mac_address, - .ndo_do_ioctl = bpq_ioctl, + .ndo_siocdevprivate = bpq_siocdevprivate, };static void bpq_setup (struct net_device *dev)
drivers/net/hamradio/dmascc.c +8 -10
@@ -225,7 +225,8 @@ static int read_scc_data(struct scc_priv *priv);static int scc_open (struct net_device *dev);static int scc_close (struct net_device *dev); -static int scc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +static int scc_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static int scc_send_packet (struct sk_buff *skb,struct net_device *dev);static int scc_set_mac_address (struct net_device *dev,void *sa);
@@ -432,7 +433,7 @@ static const struct net_device_ops scc_netdev_ops = { .ndo_open = scc_open, .ndo_stop = scc_close, .ndo_start_xmit = scc_send_packet, - .ndo_do_ioctl = scc_ioctl, + .ndo_siocdevprivate = scc_siocdevprivate, .ndo_set_mac_address = scc_set_mac_address, };
@@ -881,15 +882,13 @@ static int scc_close(struct net_device *dev) } -static int scc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int scc_siocdevprivate (struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd) {struct scc_priv *priv = dev->ml_priv;switch (cmd) {case SIOCGSCCPARAM : -if (copy_to_user - (ifr->ifr_data, &priv->param, -sizeof (struct scc_param ))) +if (copy_to_user (data, &priv->param,sizeof (struct scc_param )))return -EFAULT ;return 0 ;case SIOCSSCCPARAM :
@@ -897,13 +896,12 @@ static int scc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return -EPERM ;if (netif_running (dev))return -EAGAIN ; -if (copy_from_user - (&priv->param, ifr->ifr_data, -sizeof (struct scc_param ))) +if (copy_from_user (&priv->param, data, +sizeof (struct scc_param )))return -EFAULT ;return 0 ;default : -return -EINVAL ; +return -EOPNOTSUPP ; } }
drivers/net/hamradio/hdlcdrv.c +11 -9
@@ -483,23 +483,25 @@ static int hdlcdrv_close(struct net_device *dev)/* --------------------------------------------------------------------- */ -static int hdlcdrv_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int hdlcdrv_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {struct hdlcdrv_state *s =netdev_priv (dev);struct hdlcdrv_ioctl bi; -if (cmd !=SIOCDEVPRIVATE ) { -if (s->ops && s->ops->ioctl) -return s->ops->ioctl (dev, ifr, &bi, cmd); +if (cmd !=SIOCDEVPRIVATE )return -ENOIOCTLCMD ; - } -if (copy_from_user (&bi, ifr->ifr_data,sizeof (bi))) + +if (in_compat_syscall ())/* to be implemented */ +return -ENOIOCTLCMD ; + +if (copy_from_user (&bi, data,sizeof (bi)))return -EFAULT ;switch (bi.cmd) {default :if (s->ops && s->ops->ioctl) -return s->ops->ioctl (dev, ifr, &bi, cmd); +return s->ops->ioctl (dev, data, &bi, cmd);return -ENOIOCTLCMD ;case HDLCDRVCTL_GETCHANNELPAR :
@@ -605,7 +607,7 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)break ; } -if (copy_to_user (ifr->ifr_data, &bi,sizeof (bi))) +if (copy_to_user (data, &bi,sizeof (bi)))return -EFAULT ;return 0 ;
@@ -617,7 +619,7 @@ static const struct net_device_ops hdlcdrv_netdev = { .ndo_open = hdlcdrv_open, .ndo_stop = hdlcdrv_close, .ndo_start_xmit = hdlcdrv_send_packet, - .ndo_do_ioctl = hdlcdrv_ioctl, + .ndo_siocdevprivate = hdlcdrv_siocdevprivate, .ndo_set_mac_address = hdlcdrv_set_mac_address, };
drivers/net/hamradio/scc.c +8 -5
@@ -210,7 +210,8 @@ static int scc_net_close(struct net_device *dev);static void scc_net_rx (struct scc_channel *scc,struct sk_buff *skb);static netdev_tx_t scc_net_tx (struct sk_buff *skb,struct net_device *dev); -static int scc_net_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +static int scc_net_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static int scc_net_set_mac_address (struct net_device *dev,void *addr);static struct net_device_stats *scc_net_get_stats (struct net_device *dev);
@@ -1550,7 +1551,7 @@ static const struct net_device_ops scc_netdev_ops = { .ndo_start_xmit = scc_net_tx, .ndo_set_mac_address = scc_net_set_mac_address, .ndo_get_stats = scc_net_get_stats, - .ndo_do_ioctl = scc_net_ioctl, + .ndo_siocdevprivate = scc_net_siocdevprivate, };/* ----> Initialize device <----- */
@@ -1703,7 +1704,8 @@ static netdev_tx_t scc_net_tx(struct sk_buff *skb, struct net_device *dev)* SIOCSCCCAL - send calib. pattern arg: (struct scc_calibrate *) arg */ -static int scc_net_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int scc_net_siocdevprivate (struct net_device *dev, +struct ifreq *ifr,void __user *arg,int cmd) {struct scc_kiss_cmd kiss_cmd;struct scc_mem_config memcfg;
@@ -1712,8 +1714,6 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)struct scc_channel *scc = (struct scc_channel *) dev->ml_priv;int chan;unsigned char device_name[IFNAMSIZ ]; -void __user *arg = ifr->ifr_data; -if (!Driver_Initialized) {
@@ -1722,6 +1722,9 @@ static int scc_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)int found =1 ;if (!capable (CAP_SYS_RAWIO ))return -EPERM ; +if (in_compat_syscall ()) +return -EOPNOTSUPP ; +if (!arg)return -EFAULT ;if (Nchips >=SCC_MAXCHIPS )
drivers/net/hamradio/yam.c +9 -10
@@ -920,15 +920,15 @@ static int yam_close(struct net_device *dev)/* --------------------------------------------------------------------- */ -static int yam_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int yam_siocdevprivate (struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd) {struct yam_port *yp =netdev_priv (dev);struct yamdrv_ioctl_cfg yi;struct yamdrv_ioctl_mcs *ym;int ioctl_cmd; -if (copy_from_user (&ioctl_cmd, ifr->ifr_data,sizeof (int ))) -return -EFAULT ; +if (copy_from_user (&ioctl_cmd, data,sizeof (int ))) +return -EFAULT ;if (yp->magic !=YAM_MAGIC )return -EINVAL ;
@@ -947,8 +947,7 @@ static int yam_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)case SIOCYAMSMCS :if (netif_running (dev))return -EINVAL ;/* Cannot change this parameter when up */ - ym =memdup_user (ifr->ifr_data, -sizeof (struct yamdrv_ioctl_mcs )); + ym =memdup_user (data,sizeof (struct yamdrv_ioctl_mcs ));if (IS_ERR (ym))return PTR_ERR (ym);if (ym->cmd !=SIOCYAMSMCS )
@@ -965,8 +964,8 @@ static int yam_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)case SIOCYAMSCFG :if (!capable (CAP_SYS_RAWIO ))return -EPERM ; -if (copy_from_user (&yi, ifr->ifr_data,sizeof (struct yamdrv_ioctl_cfg ))) -return -EFAULT ; +if (copy_from_user (&yi, data,sizeof (struct yamdrv_ioctl_cfg ))) +return -EFAULT ;if (yi.cmd !=SIOCYAMSCFG )return -EINVAL ;
@@ -1045,8 +1044,8 @@ static int yam_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) yi.cfg.txtail = yp->txtail; yi.cfg.persist = yp->pers; yi.cfg.slottime = yp->slot; -if (copy_to_user (ifr->ifr_data, &yi,sizeof (struct yamdrv_ioctl_cfg ))) -return -EFAULT ; +if (copy_to_user (data, &yi,sizeof (struct yamdrv_ioctl_cfg ))) +return -EFAULT ;break ;default :
@@ -1074,7 +1073,7 @@ static const struct net_device_ops yam_netdev_ops = { .ndo_open = yam_open, .ndo_stop = yam_close, .ndo_start_xmit = yam_send_packet, - .ndo_do_ioctl = yam_ioctl, + .ndo_siocdevprivate = yam_siocdevprivate, .ndo_set_mac_address = yam_set_mac_address, };
include/linux/hdlcdrv.h +1 -1
@@ -79,7 +79,7 @@ struct hdlcdrv_ops {*/ int (*open)(struct net_device *);int (*close)(struct net_device *); -int (*ioctl)(struct net_device *,struct ifreq *, +int (*ioctl)(struct net_device *,void __user *,struct hdlcdrv_ioctl *,int ); };
Signature · 1 line
2.29.2
PATCH v3 19/31 airo: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The airo driver overloads SIOCDEVPRIVATE ioctls with another set based on SIOCIWFIRSTPRIV. Only the first ones actually work (also in compat mode) as the others do not get passed down any more.
Change it over to ndo_siocdevprivate for clarification.
--- drivers/net/wireless/cisco/airo.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
drivers/net/wireless/cisco/airo.c +8 -7
@@ -1144,7 +1144,7 @@ static int waitbusy(struct airo_info *ai);static irqreturn_t airo_interrupt (int irq,void * dev_id);static int airo_thread (void *data);static void timer_func (struct net_device *dev); -static int airo_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); +static int airo_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *,int cmd);static struct iw_statistics *airo_get_wireless_stats (struct net_device *dev);#ifdef CISCO_EXT static int readrids (struct net_device *dev,aironet_ioctl *comp);
@@ -2664,7 +2664,7 @@ static const struct net_device_ops airo11_netdev_ops = { .ndo_start_xmit = airo_start_xmit11, .ndo_get_stats = airo_get_stats, .ndo_set_mac_address = airo_set_mac_address, - .ndo_do_ioctl = airo_ioctl, + .ndo_siocdevprivate = airo_siocdevprivate, };static void wifi_setup (struct net_device *dev)
@@ -2764,7 +2764,7 @@ static const struct net_device_ops airo_netdev_ops = { .ndo_get_stats = airo_get_stats, .ndo_set_rx_mode = airo_set_multicast_list, .ndo_set_mac_address = airo_set_mac_address, - .ndo_do_ioctl = airo_ioctl, + .ndo_siocdevprivate = airo_siocdevprivate, .ndo_validate_addr = eth_validate_addr, };
@@ -2775,7 +2775,7 @@ static const struct net_device_ops mpi_netdev_ops = { .ndo_get_stats = airo_get_stats, .ndo_set_rx_mode = airo_set_multicast_list, .ndo_set_mac_address = airo_set_mac_address, - .ndo_do_ioctl = airo_ioctl, + .ndo_siocdevprivate = airo_siocdevprivate, .ndo_validate_addr = eth_validate_addr, };
@@ -7661,7 +7661,8 @@ static const struct iw_handler_def airo_handler_def =* Javier Achirica did a great job of merging code from the unnamed CISCO * developer that added support for flashing the card. */ -static int airo_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) +static int airo_siocdevprivate (struct net_device *dev,struct ifreq *rq, +void __user *data,int cmd) {int rc =0 ;struct airo_info *ai = dev->ml_priv;
@@ -7678,7 +7679,7 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {int val =AIROMAGIC ;aironet_ioctl com; -if (copy_from_user (&com, rq->ifr_data,sizeof (com))) +if (copy_from_user (&com, data,sizeof (com))) rc = -EFAULT ;else if (copy_to_user (com.data, (char *)&val,sizeof (val))) rc = -EFAULT ;
@@ -7694,7 +7695,7 @@ static int airo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)*/ {aironet_ioctl com; -if (copy_from_user (&com, rq->ifr_data,sizeof (com))) { +if (copy_from_user (&com, data,sizeof (com))) { rc = -EFAULT ;break ; }
Signature · 1 line
2.29.2
PATCH v3 20/31 ip_tunnel: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The various ipv4 and ipv6 tunnel drivers each implement a set of 12 SIOCDEVPRIVATE commands for managing tunnels. These all work correctly in compat mode.
Move them over to the new .ndo_siocdevprivate operation.
--- include/net/ip_tunnels.h | 3 ++- net/ipv4/ip_gre.c | 2 +- net/ipv4/ip_tunnel.c | 9 +++++---- net/ipv4/ip_vti.c | 2 +- net/ipv4/ipip.c | 2 +- net/ipv6/ip6_gre.c | 17 +++++++++-------- net/ipv6/ip6_tunnel.c | 21 +++++++++++---------- net/ipv6/ip6_vti.c | 21 +++++++++++---------- net/ipv6/sit.c | 35 ++++++++++++++++++----------------- 9 files changed, 59 insertions(+), 53 deletions(-)
include/net/ip_tunnels.h +2 -1
@@ -270,7 +270,8 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,void ip_md_tunnel_xmit (struct sk_buff *skb,struct net_device *dev,const u8 proto,int tunnel_hlen);int ip_tunnel_ctl (struct net_device *dev,struct ip_tunnel_parm *p,int cmd); -int ip_tunnel_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +int ip_tunnel_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);int __ip_tunnel_change_mtu (struct net_device *dev,int new_mtu,bool strict);int ip_tunnel_change_mtu (struct net_device *dev,int new_mtu);
net/ipv4/ip_gre.c +1 -1
@@ -923,7 +923,7 @@ static const struct net_device_ops ipgre_netdev_ops = { .ndo_stop = ipgre_close, #endif .ndo_start_xmit = ipgre_xmit, - .ndo_do_ioctl = ip_tunnel_ioctl, + .ndo_siocdevprivate = ip_tunnel_siocdevprivate, .ndo_change_mtu = ip_tunnel_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip_tunnel_get_iflink,
net/ipv4/ip_tunnel.c +5 -4
@@ -958,19 +958,20 @@ int ip_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd) }EXPORT_SYMBOL_GPL (ip_tunnel_ctl); -int ip_tunnel_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +int ip_tunnel_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {struct ip_tunnel_parm p;int err; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p)))return -EFAULT ; err = dev->netdev_ops->ndo_tunnel_ctl (dev, &p, cmd); -if (!err &©_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) +if (!err &©_to_user (data, &p,sizeof (p)))return -EFAULT ;return err; } -EXPORT_SYMBOL_GPL (ip_tunnel_ioctl); +EXPORT_SYMBOL_GPL (ip_tunnel_siocdevprivate);int __ip_tunnel_change_mtu (struct net_device *dev,int new_mtu,bool strict) {
net/ipv4/ip_vti.c +1 -1
@@ -405,7 +405,7 @@ static const struct net_device_ops vti_netdev_ops = { .ndo_init = vti_tunnel_init, .ndo_uninit = ip_tunnel_uninit, .ndo_start_xmit = vti_tunnel_xmit, - .ndo_do_ioctl = ip_tunnel_ioctl, + .ndo_siocdevprivate = ip_tunnel_siocdevprivate, .ndo_change_mtu = ip_tunnel_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip_tunnel_get_iflink,
net/ipv4/ipip.c +1 -1
@@ -347,7 +347,7 @@ static const struct net_device_ops ipip_netdev_ops = { .ndo_init = ipip_tunnel_init, .ndo_uninit = ip_tunnel_uninit, .ndo_start_xmit = ipip_tunnel_xmit, - .ndo_do_ioctl = ip_tunnel_ioctl, + .ndo_siocdevprivate = ip_tunnel_siocdevprivate, .ndo_change_mtu = ip_tunnel_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip_tunnel_get_iflink,
net/ipv6/ip6_gre.c +9 -8
@@ -1244,8 +1244,9 @@ static void ip6gre_tnl_parm_to_user(struct ip6_tnl_parm2 *u,memcpy (u->name, p->name,sizeof (u->name)); } -static int ip6gre_tunnel_ioctl (struct net_device *dev, -struct ifreq *ifr,int cmd) +static int ip6gre_tunnel_siocdevprivate (struct net_device *dev, +struct ifreq *ifr,void __user *data, +int cmd) {int err =0 ;struct ip6_tnl_parm2 p;
@@ -1259,7 +1260,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,switch (cmd) {case SIOCGETTUNNEL :if (dev == ign->fb_tunnel_dev) { -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) { +if (copy_from_user (&p, data,sizeof (p))) { err = -EFAULT ;break ; }
@@ -1270,7 +1271,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev, }memset (&p,0 ,sizeof (p));ip6gre_tnl_parm_to_user (&p, &t->parms); -if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) +if (copy_to_user (data, &p,sizeof (p))) err = -EFAULT ;break ;
@@ -1281,7 +1282,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev, goto done; err = -EFAULT ; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p))) goto done; err = -EINVAL ;
@@ -1318,7 +1319,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,memset (&p,0 ,sizeof (p));ip6gre_tnl_parm_to_user (&p, &t->parms); -if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) +if (copy_to_user (data, &p,sizeof (p))) err = -EFAULT ; }else err = (cmd ==SIOCADDTUNNEL ? -ENOBUFS : -ENOENT );
@@ -1331,7 +1332,7 @@ static int ip6gre_tunnel_ioctl(struct net_device *dev,if (dev == ign->fb_tunnel_dev) { err = -EFAULT ; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p))) goto done; err = -ENOENT ;ip6gre_tnl_parm_from_user (&p1, &p);
@@ -1398,7 +1399,7 @@ static const struct net_device_ops ip6gre_netdev_ops = { .ndo_init = ip6gre_tunnel_init, .ndo_uninit = ip6gre_tunnel_uninit, .ndo_start_xmit = ip6gre_tunnel_xmit, - .ndo_do_ioctl = ip6gre_tunnel_ioctl, + .ndo_siocdevprivate = ip6gre_tunnel_siocdevprivate, .ndo_change_mtu = ip6_tnl_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip6_tnl_get_iflink,
net/ipv6/ip6_tunnel.c +11 -10
@@ -1581,9 +1581,10 @@ ip6_tnl_parm_to_user(struct ip6_tnl_parm *u, const struct __ip6_tnl_parm *p) }/** -* ip6_tnl_ioctl - configure ipv6 tunnels from userspace +* ip6_tnl_siocdevprivate - configure ipv6 tunnels from userspace * @dev: virtual device associated with tunnel -* @ifr: parameters passed from userspace +* @ifr: unused +* @data: parameters passed from userspace * @cmd: command to be performed * * Description:
@@ -1609,7 +1610,8 @@ ip6_tnl_parm_to_user(struct ip6_tnl_parm *u, const struct __ip6_tnl_parm *p)**/ static int -ip6_tnl_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +ip6_tnl_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {int err =0 ;struct ip6_tnl_parm p;
@@ -1623,7 +1625,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)switch (cmd) {case SIOCGETTUNNEL :if (dev == ip6n->fb_tnl_dev) { -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) { +if (copy_from_user (&p, data,sizeof (p))) { err = -EFAULT ;break ; }
@@ -1635,9 +1637,8 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)memset (&p,0 ,sizeof (p)); }ip6_tnl_parm_to_user (&p, &t->parms); -if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) { +if (copy_to_user (data, &p,sizeof (p))) err = -EFAULT ; - }break ;case SIOCADDTUNNEL :case SIOCCHGTUNNEL :
@@ -1645,7 +1646,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (!ns_capable (net->user_ns,CAP_NET_ADMIN ))break ; err = -EFAULT ; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p)))break ; err = -EINVAL ; if (p.proto != IPPROTO_IPV6 && p.proto != IPPROTO_IPIP &&
@@ -1669,7 +1670,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (!IS_ERR (t)) { err =0 ;ip6_tnl_parm_to_user (&p, &t->parms); -if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) +if (copy_to_user (data, &p,sizeof (p))) err = -EFAULT ; }else {
@@ -1683,7 +1684,7 @@ ip6_tnl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (dev == ip6n->fb_tnl_dev) { err = -EFAULT ; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p)))break ; err = -ENOENT ;ip6_tnl_parm_from_user (&p1, &p);
@@ -1802,7 +1803,7 @@ static const struct net_device_ops ip6_tnl_netdev_ops = { .ndo_init = ip6_tnl_dev_init, .ndo_uninit = ip6_tnl_dev_uninit, .ndo_start_xmit = ip6_tnl_start_xmit, - .ndo_do_ioctl = ip6_tnl_ioctl, + .ndo_siocdevprivate = ip6_tnl_siocdevprivate, .ndo_change_mtu = ip6_tnl_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip6_tnl_get_iflink,
net/ipv6/ip6_vti.c +11 -10
@@ -771,13 +771,14 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p) }/** -* vti6_ioctl - configure vti6 tunnels from userspace +* vti6_siocdevprivate - configure vti6 tunnels from userspace * @dev: virtual device associated with tunnel -* @ifr: parameters passed from userspace +* @ifr: unused +* @data: parameters passed from userspace * @cmd: command to be performed * * Description: -* vti6_ioctl() is used for managing vti6 tunnels +* vti6_siocdevprivate() is used for managing vti6 tunnels * from userspace. * * The possible commands are the following:
@@ -798,7 +799,7 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p)* %-ENODEV if attempting to change or delete a nonexisting device **/ static int -vti6_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +vti6_siocdevprivate (struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd) {int err =0 ;struct ip6_tnl_parm2 p;
@@ -810,7 +811,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)switch (cmd) {case SIOCGETTUNNEL :if (dev == ip6n->fb_tnl_dev) { -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) { +if (copy_from_user (&p, data,sizeof (p))) { err = -EFAULT ;break ; }
@@ -822,7 +823,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (!t) t =netdev_priv (dev);vti6_parm_to_user (&p, &t->parms); -if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) +if (copy_to_user (data, &p,sizeof (p))) err = -EFAULT ;break ;case SIOCADDTUNNEL :
@@ -831,7 +832,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (!ns_capable (net->user_ns,CAP_NET_ADMIN ))break ; err = -EFAULT ; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p)))break ; err = -EINVAL ;if (p.proto !=IPPROTO_IPV6 && p.proto !=0 )
@@ -852,7 +853,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (t) { err =0 ;vti6_parm_to_user (&p, &t->parms); -if (copy_to_user (ifr->ifr_ifru.ifru_data, &p,sizeof (p))) +if (copy_to_user (data, &p,sizeof (p))) err = -EFAULT ; }else
@@ -865,7 +866,7 @@ vti6_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (dev == ip6n->fb_tnl_dev) { err = -EFAULT ; -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p)))break ; err = -ENOENT ;vti6_parm_from_user (&p1, &p);
@@ -890,7 +891,7 @@ static const struct net_device_ops vti6_netdev_ops = { .ndo_init = vti6_dev_init, .ndo_uninit = vti6_dev_uninit, .ndo_start_xmit = vti6_tnl_xmit, - .ndo_do_ioctl = vti6_ioctl, + .ndo_siocdevprivate = vti6_siocdevprivate, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip6_tnl_get_iflink, };
net/ipv6/sit.c +18 -17
@@ -299,9 +299,8 @@ __ipip6_tunnel_locate_prl(struct ip_tunnel *t, __be32 addr) } -static int ipip6_tunnel_get_prl (struct net_device *dev,struct ifreq *ifr) +static int ipip6_tunnel_get_prl (struct net_device *dev,struct ip_tunnel_prl __user *a) { -struct ip_tunnel_prl __user *a = ifr->ifr_ifru.ifru_data;struct ip_tunnel *t =netdev_priv (dev);struct ip_tunnel_prl kprl, *kp;struct ip_tunnel_prl_entry *prl;
@@ -454,8 +453,8 @@ ipip6_tunnel_del_prl(struct ip_tunnel *t, struct ip_tunnel_prl *a)return err; } -static int ipip6_tunnel_prl_ctl (struct net_device *dev,struct ifreq *ifr, -int cmd) +static int ipip6_tunnel_prl_ctl (struct net_device *dev, +struct ip_tunnel_prl __user *data,int cmd) {struct ip_tunnel *t =netdev_priv (dev);struct ip_tunnel_prl prl;
@@ -466,7 +465,7 @@ static int ipip6_tunnel_prl_ctl(struct net_device *dev, struct ifreq *ifr,if (dev ==dev_to_sit_net (dev)->fb_tunnel_dev)return -EINVAL ; -if (copy_from_user (&prl, ifr->ifr_ifru.ifru_data,sizeof (prl))) +if (copy_from_user (&prl, data,sizeof (prl)))return -EFAULT ;switch (cmd) {
@@ -1198,14 +1197,14 @@ static int ipip6_tunnel_update_6rd(struct ip_tunnel *t, }static int -ipip6_tunnel_get6rd (struct net_device *dev,struct ifreq *ifr) +ipip6_tunnel_get6rd (struct net_device *dev,struct ip_tunnel_parm __user *data) {struct ip_tunnel *t =netdev_priv (dev);struct ip_tunnel_6rd ip6rd;struct ip_tunnel_parm p;if (dev ==dev_to_sit_net (dev)->fb_tunnel_dev) { -if (copy_from_user (&p, ifr->ifr_ifru.ifru_data,sizeof (p))) +if (copy_from_user (&p, data,sizeof (p)))return -EFAULT ; t =ipip6_tunnel_locate (t->net, &p,0 ); }
@@ -1216,13 +1215,14 @@ ipip6_tunnel_get6rd(struct net_device *dev, struct ifreq *ifr) ip6rd.relay_prefix = t->ip6rd.relay_prefix; ip6rd.prefixlen = t->ip6rd.prefixlen; ip6rd.relay_prefixlen = t->ip6rd.relay_prefixlen; -if (copy_to_user (ifr->ifr_ifru.ifru_data, &ip6rd,sizeof (ip6rd))) +if (copy_to_user (data, &ip6rd,sizeof (ip6rd)))return -EFAULT ;return 0 ; }static int -ipip6_tunnel_6rdctl (struct net_device *dev,struct ifreq *ifr,int cmd) +ipip6_tunnel_6rdctl (struct net_device *dev,struct ip_tunnel_6rd __user *data, +int cmd) {struct ip_tunnel *t =netdev_priv (dev);struct ip_tunnel_6rd ip6rd;
@@ -1230,7 +1230,7 @@ ipip6_tunnel_6rdctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (!ns_capable (t->net->user_ns,CAP_NET_ADMIN ))return -EPERM ; -if (copy_from_user (&ip6rd, ifr->ifr_ifru.ifru_data,sizeof (ip6rd))) +if (copy_from_user (&ip6rd, data,sizeof (ip6rd)))return -EFAULT ;if (cmd !=SIOCDEL6RD ) {
@@ -1369,27 +1369,28 @@ ipip6_tunnel_ctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd) }static int -ipip6_tunnel_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +ipip6_tunnel_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {switch (cmd) {case SIOCGETTUNNEL :case SIOCADDTUNNEL :case SIOCCHGTUNNEL :case SIOCDELTUNNEL : -return ip_tunnel_ioctl (dev, ifr, cmd); +return ip_tunnel_siocdevprivate (dev, ifr, data, cmd);case SIOCGETPRL : -return ipip6_tunnel_get_prl (dev, ifr); +return ipip6_tunnel_get_prl (dev, data);case SIOCADDPRL :case SIOCDELPRL :case SIOCCHGPRL : -return ipip6_tunnel_prl_ctl (dev, ifr, cmd); +return ipip6_tunnel_prl_ctl (dev, data, cmd);#ifdef CONFIG_IPV6_SIT_6RD case SIOCGET6RD : -return ipip6_tunnel_get6rd (dev, ifr); +return ipip6_tunnel_get6rd (dev, data);case SIOCADD6RD :case SIOCCHG6RD :case SIOCDEL6RD : -return ipip6_tunnel_6rdctl (dev, ifr, cmd); +return ipip6_tunnel_6rdctl (dev, data, cmd);#endif default :return -EINVAL ;
@@ -1400,7 +1401,7 @@ static const struct net_device_ops ipip6_netdev_ops = { .ndo_init = ipip6_tunnel_init, .ndo_uninit = ipip6_tunnel_uninit, .ndo_start_xmit = sit_tunnel_xmit, - .ndo_do_ioctl = ipip6_tunnel_ioctl, + .ndo_siocdevprivate = ipip6_tunnel_siocdevprivate, .ndo_get_stats64 = dev_get_tstats64, .ndo_get_iflink = ip_tunnel_get_iflink, .ndo_tunnel_ctl = ipip6_tunnel_ctl,
Signature · 1 line
2.29.2
PATCH v3 21/31 hippi: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
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.
--- drivers/net/hippi/rrunner.c | 11 ++++++----- drivers/net/hippi/rrunner.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/net/hippi/rrunner.c +6 -5
@@ -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; }
drivers/net/hippi/rrunner.h +2 -1
@@ -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,
Signature · 1 line
2.29.2
PATCH v3 22/31 sb1000: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The private sb1000 ioctl commands all work correctly in compat mode. Change the to ndo_siocdevprivate as a cleanup.
--- drivers/net/sb1000.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/net/sb1000.c +11 -9
@@ -78,7 +78,8 @@ struct sb1000_private {/* prototypes for Linux interface */ extern int sb1000_probe (struct net_device *dev);static int sb1000_open (struct net_device *dev); -static int sb1000_dev_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +static int sb1000_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd);static netdev_tx_t sb1000_start_xmit (struct sk_buff *skb,struct net_device *dev);static irqreturn_t sb1000_interrupt (int irq,void *dev_id);
@@ -135,7 +136,7 @@ MODULE_DEVICE_TABLE(pnp, sb1000_pnp_ids);static const struct net_device_ops sb1000_netdev_ops = { .ndo_open = sb1000_open, .ndo_start_xmit = sb1000_start_xmit, - .ndo_do_ioctl = sb1000_dev_ioctl, + .ndo_siocdevprivate = sb1000_siocdevprivate, .ndo_stop = sb1000_close, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
@@ -987,7 +988,8 @@ sb1000_open(struct net_device *dev)return 0 ;/* Always succeed */ } -static int sb1000_dev_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int sb1000_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) {char * name;unsigned char version[2 ];
@@ -1011,7 +1013,7 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) stats[2 ] = dev->stats.rx_packets; stats[3 ] = dev->stats.rx_errors; stats[4 ] = dev->stats.rx_dropped; -if (copy_to_user (ifr->ifr_data, stats,sizeof (stats))) +if (copy_to_user (data, stats,sizeof (stats)))return -EFAULT ; status =0 ;break ;
@@ -1019,21 +1021,21 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)case SIOCGCMFIRMWARE :/* get firmware version */ if ((status =sb1000_get_firmware_version (ioaddr, name, version,1 )))return status; -if (copy_to_user (ifr->ifr_data, version,sizeof (version))) +if (copy_to_user (data, version,sizeof (version)))return -EFAULT ;break ;case SIOCGCMFREQUENCY :/* get frequency */ if ((status =sb1000_get_frequency (ioaddr, name, &frequency)))return status; -if (put_user (frequency, (int __user *) ifr->ifr_data)) +if (put_user (frequency, (int __user *)data))return -EFAULT ;break ;case SIOCSCMFREQUENCY :/* set frequency */ if (!capable (CAP_NET_ADMIN ))return -EPERM ; -if (get_user (frequency, (int __user *) ifr->ifr_data)) +if (get_user (frequency, (int __user *)data))return -EFAULT ;if ((status =sb1000_set_frequency (ioaddr, name, frequency)))return status;
@@ -1042,14 +1044,14 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)case SIOCGCMPIDS :/* get PIDs */ if ((status =sb1000_get_PIDs (ioaddr, name,PID )))return status; -if (copy_to_user (ifr->ifr_data,PID ,sizeof (PID ))) +if (copy_to_user (data,PID ,sizeof (PID )))return -EFAULT ;break ;case SIOCSCMPIDS :/* set PIDs */ if (!capable (CAP_NET_ADMIN ))return -EPERM ; -if (copy_from_user (PID , ifr->ifr_data,sizeof (PID ))) +if (copy_from_user (PID , data,sizeof (PID )))return -EFAULT ;if ((status =sb1000_set_PIDs (ioaddr, name,PID )))return status;
Signature · 1 line
2.29.2
PATCH v3 23/31 ppp: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
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.
--- drivers/net/ppp/ppp_generic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ppp/ppp_generic.c +3 -3
@@ -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, };
Signature · 1 line
2.29.2
PATCH v3 24/31 wan: use ndo_siocdevprivate
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The wan drivers each support some custom SIOCDEVPRIVATE ioctls, plus the common SIOCWANDEV command.
Split these so the ioctl callback only deals with SIOCWANDEV and the rest is handled by ndo_siocdevprivate.
It might make sense to also split out SIOCWANDEV into a separate callback in order to eventually remove ndo_do_ioctl entirely.
--- drivers/net/wan/c101.c | 20 ++++++++++++----- drivers/net/wan/farsync.c | 39 +++++++++++++++++++++++++--------- drivers/net/wan/hdlc_fr.c | 3 +++ drivers/net/wan/lmc/lmc_main.c | 39 ++++++++++++++++++++-------------- drivers/net/wan/n2.c | 19 +++++++++++------ drivers/net/wan/pc300too.c | 19 +++++++++++------ drivers/net/wan/pci200syn.c | 19 +++++++++++------ drivers/net/wan/sbni.c | 15 +++++++------ 8 files changed, 117 insertions(+), 56 deletions(-)
drivers/net/wan/c101.c +15 -5
@@ -208,14 +208,12 @@ static int c101_close(struct net_device *dev)return 0 ; } -static int c101_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int c101_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) { -const size_t size =sizeof (sync_serial_settings); -sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +#ifdef DEBUG_RINGS port_t *port =dev_to_port (dev); -#ifdef DEBUG_RINGS if (cmd ==SIOCDEVPRIVATE ) {sca_dump_rings (dev); printk(KERN_DEBUG "MSCI1: ST: %02x %02x %02x %02x\n",
@@ -226,6 +224,17 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return 0; }#endif + +return -EOPNOTSUPP ; +} + +static int c101_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +{ +const size_t size =sizeof (sync_serial_settings); +sync_serial_settings new_line; +sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +port_t *port =dev_to_port (dev); +if (cmd !=SIOCWANDEV )return hdlc_ioctl (dev, ifr, cmd);
@@ -287,6 +296,7 @@ static const struct net_device_ops c101_ops = { .ndo_stop = c101_close, .ndo_start_xmit = hdlc_start_xmit, .ndo_do_ioctl = c101_ioctl, + .ndo_siocdevprivate = c101_siocdevprivate, };static int __init c101_run (unsigned long irq,unsigned long winbase)
drivers/net/wan/farsync.c +29 -10
@@ -1909,7 +1909,7 @@ fst_get_iface(struct fst_card_info *card, struct fst_port_info *port, }static int -fst_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +fst_siocdevprivate (struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd) {struct fst_card_info *card;struct fst_port_info *port;
@@ -1918,7 +1918,7 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)unsigned long flags;void *buf; -dbg (DBG_IOCTL ,"ioctl: %x, %p\n" , cmd, ifr->ifr_data); +dbg (DBG_IOCTL ,"ioctl: %x, %p\n" , cmd, data); port =dev_to_port (dev); card = port->card;
@@ -1942,11 +1942,10 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)/* First copy in the header with the length and offset of data * to write */ -if (!ifr->ifr_data) +if (!data)return -EINVAL ; -if (copy_from_user (&wrthdr, ifr->ifr_data, -sizeof (struct fstioc_write ))) +if (copy_from_user (&wrthdr, data,sizeof (struct fstioc_write )))return -EFAULT ;/* Sanity check the parameters. We don't support partial writes
@@ -1958,7 +1957,7 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)/* Now copy the data to the card. */ - buf =memdup_user (ifr->ifr_data +sizeof (struct fstioc_write ), + buf =memdup_user (data +sizeof (struct fstioc_write ), wrthdr.size);if (IS_ERR (buf))return PTR_ERR (buf);
@@ -1991,12 +1990,12 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } } -if (!ifr->ifr_data) +if (!data)return -EINVAL ;gather_conf_info (card, port, &info); -if (copy_to_user (ifr->ifr_data, &info,sizeof (info))) +if (copy_to_user (data, &info,sizeof (info)))return -EFAULT ;return 0 ;
@@ -2011,11 +2010,30 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) card->card_no, card->state);return -EIO ; } -if (copy_from_user (&info, ifr->ifr_data,sizeof (info))) +if (copy_from_user (&info, data,sizeof (info)))return -EFAULT ;return set_conf_from_info (card, port, &info); +default : +return -EINVAL ; + } +} +static int +fst_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +{ +struct fst_card_info *card; +struct fst_port_info *port; + +dbg (DBG_IOCTL ,"ioctl: %x, %x\n" , cmd, ifr->ifr_settings.type); + + port =dev_to_port (dev); + card = port->card; + +if (!capable (CAP_NET_ADMIN )) +return -EPERM ; + +switch (cmd) {case SIOCWANDEV :switch (ifr->ifr_settings.type) {case IF_GET_IFACE :
@@ -2310,7 +2328,8 @@ static const struct net_device_ops fst_ops = { .ndo_open = fst_open, .ndo_stop = fst_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = fst_ioctl, + .ndo_do_ioctl = fst_ioctl, + .ndo_siocdevprivate = fst_siocdevprivate, .ndo_tx_timeout = fst_tx_timeout, };
drivers/net/wan/hdlc_fr.c +3 -0
@@ -362,6 +362,9 @@ static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)struct pvc_device *pvc = dev->ml_priv;fr_proto_pvc_info info; +if (cmd !=SIOCWANDEV ) +return -EOPNOTSUPP ; +if (ifr->ifr_settings.type ==IF_GET_PROTO ) {if (dev->type ==ARPHRD_ETHER ) ifr->ifr_settings.type =IF_PROTO_FR_ETH_PVC ;
drivers/net/wan/lmc/lmc_main.c +23 -16
@@ -105,7 +105,8 @@ static void lmc_driver_timeout(struct net_device *dev, unsigned int txqueue);* linux reserves 16 device specific IOCTLs. We call them * LMCIOC* to control various bits of our world. */ -int lmc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd)/*fold00*/ +static int lmc_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd)/*fold00*/ {lmc_softc_t *sc =dev_to_sc (dev);lmc_ctl_t ctl;
@@ -124,7 +125,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/* To date internally, just copy this out to the user. */ case LMCIOCGINFO :/*fold01*/ -if (copy_to_user (ifr->ifr_data, &sc->ictl,sizeof (lmc_ctl_t))) +if (copy_to_user (data, &sc->ictl,sizeof (lmc_ctl_t))) ret = -EFAULT ;else ret =0 ;
@@ -141,7 +142,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/break ; } -if (copy_from_user (&ctl, ifr->ifr_data,sizeof (lmc_ctl_t))) { +if (copy_from_user (&ctl, data,sizeof (lmc_ctl_t))) { ret = -EFAULT ;break ; }
@@ -171,7 +172,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/break ; } -if (copy_from_user (&new_type, ifr->ifr_data,sizeof (u16))) { +if (copy_from_user (&new_type, data,sizeof (u16))) { ret = -EFAULT ;break ; }
@@ -211,8 +212,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ sc->lmc_xinfo.Magic1 =0xDEADBEEF ; -if (copy_to_user (ifr->ifr_data, &sc->lmc_xinfo, -sizeof (struct lmc_xinfo ))) +if (copy_to_user (data, &sc->lmc_xinfo,sizeof (struct lmc_xinfo ))) ret = -EFAULT ;else ret =0 ;
@@ -245,9 +245,9 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ regVal &T1FRAMER_SEF_MASK ; }spin_unlock_irqrestore (&sc->lmc_lock, flags); -if (copy_to_user (ifr->ifr_data, &sc->lmc_device->stats, +if (copy_to_user (data, &sc->lmc_device->stats,sizeof (sc->lmc_device->stats)) || -copy_to_user (ifr->ifr_data +sizeof (sc->lmc_device->stats), +copy_to_user (data +sizeof (sc->lmc_device->stats), &sc->extra_stats,sizeof (sc->extra_stats))) ret = -EFAULT ;else
@@ -282,7 +282,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/break ; } -if (copy_from_user (&ctl, ifr->ifr_data,sizeof (lmc_ctl_t))) { +if (copy_from_user (&ctl, data,sizeof (lmc_ctl_t))) { ret = -EFAULT ;break ; }
@@ -314,11 +314,11 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/#ifdef DEBUG case LMCIOCDUMPEVENTLOG : -if (copy_to_user (ifr->ifr_data, &lmcEventLogIndex,sizeof (u32))) { +if (copy_to_user (data, &lmcEventLogIndex,sizeof (u32))) { ret = -EFAULT ;break ; } -if (copy_to_user (ifr->ifr_data +sizeof (u32), lmcEventLogBuf, +if (copy_to_user (data +sizeof (u32), lmcEventLogBuf,sizeof (lmcEventLogBuf))) ret = -EFAULT ;else
@@ -346,7 +346,7 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/*/ netif_stop_queue (dev); -if (copy_from_user (&xc, ifr->ifr_data,sizeof (struct lmc_xilinx_control ))) { +if (copy_from_user (&xc, data,sizeof (struct lmc_xilinx_control ))) { ret = -EFAULT ;break ; }
@@ -609,15 +609,21 @@ int lmc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ }break ; -default :/*fold01*/ -/* If we don't know what to do, give the protocol a shot. */ - ret =lmc_proto_ioctl (sc, ifr, cmd); -break ; +default : +break ; }return ret; } +int lmc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +{ +if (cmd !=SIOCWANDEV ) +return -EOPNOTSUPP ; + +return lmc_proto_ioctl (dev_to_sc (dev), ifr, cmd); +} +/* the watchdog process that cruises around */ static void lmc_watchdog (struct timer_list *t)/*fold00*/
@@ -789,6 +795,7 @@ static const struct net_device_ops lmc_ops = { .ndo_stop = lmc_close, .ndo_start_xmit = hdlc_start_xmit, .ndo_do_ioctl = lmc_ioctl, + .ndo_siocdevprivate = lmc_siocdevprivate, .ndo_tx_timeout = lmc_driver_timeout, .ndo_get_stats = lmc_get_stats, };
drivers/net/wan/n2.c +13 -6
@@ -227,19 +227,25 @@ static int n2_close(struct net_device *dev)return 0 ; } -static int n2_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int n2_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) { -const size_t size =sizeof (sync_serial_settings); -sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; -port_t *port =dev_to_port (dev); -#ifdef DEBUG_RINGS if (cmd ==SIOCDEVPRIVATE ) {sca_dump_rings (dev);return 0 ; }#endif +return -EOPNOTSUPP ; +} + +static int n2_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +{ +const size_t size =sizeof (sync_serial_settings); +sync_serial_settings new_line; +sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +port_t *port =dev_to_port (dev); +if (cmd !=SIOCWANDEV )return hdlc_ioctl (dev, ifr, cmd);
@@ -312,6 +318,7 @@ static const struct net_device_ops n2_ops = { .ndo_stop = n2_close, .ndo_start_xmit = hdlc_start_xmit, .ndo_do_ioctl = n2_ioctl, + .ndo_siocdevprivate = n2_siocdevprivate, }; static int __init n2_run(unsigned long io, unsigned long irq,
drivers/net/wan/pc300too.c +13 -6
@@ -174,6 +174,18 @@ static int pc300_close(struct net_device *dev)return 0 ; } +static int pc300_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) +{ +#ifdef DEBUG_RINGS +if (cmd ==SIOCDEVPRIVATE ) { +sca_dump_rings (dev); +return 0 ; + } +#endif +return -EOPNOTSUPP ; +} +static int pc300_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {const size_t size =sizeof (sync_serial_settings);
@@ -182,12 +194,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)int new_type;port_t *port =dev_to_port (dev); -#ifdef DEBUG_RINGS -if (cmd ==SIOCDEVPRIVATE ) { -sca_dump_rings (dev); -return 0 ; - } -#endif if (cmd !=SIOCWANDEV )return hdlc_ioctl (dev, ifr, cmd);
@@ -273,6 +279,7 @@ static const struct net_device_ops pc300_ops = { .ndo_stop = pc300_close, .ndo_start_xmit = hdlc_start_xmit, .ndo_do_ioctl = pc300_ioctl, + .ndo_siocdevprivate = pc300_siocdevprivate, }; static int pc300_pci_init_one(struct pci_dev *pdev,
drivers/net/wan/pci200syn.c +13 -6
@@ -167,19 +167,25 @@ static int pci200_close(struct net_device *dev)return 0 ; } -static int pci200_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int pci200_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,int cmd) { -const size_t size =sizeof (sync_serial_settings); -sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; -port_t *port =dev_to_port (dev); -#ifdef DEBUG_RINGS if (cmd ==SIOCDEVPRIVATE ) {sca_dump_rings (dev);return 0 ; }#endif +return -EOPNOTSUPP ; +} + +static int pci200_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +{ +const size_t size =sizeof (sync_serial_settings); +sync_serial_settings new_line; +sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +port_t *port =dev_to_port (dev); +if (cmd !=SIOCWANDEV )return hdlc_ioctl (dev, ifr, cmd);
@@ -254,6 +260,7 @@ static const struct net_device_ops pci200_ops = { .ndo_stop = pci200_close, .ndo_start_xmit = hdlc_start_xmit, .ndo_do_ioctl = pci200_ioctl, + .ndo_siocdevprivate = pci200_siocdevprivate, }; static int pci200_pci_init_one(struct pci_dev *pdev,
drivers/net/wan/sbni.c +8 -7
@@ -119,7 +119,8 @@ static int sbni_open( struct net_device * );static int sbni_close (struct net_device * );static netdev_tx_t sbni_start_xmit (struct sk_buff *,struct net_device * ); -static int sbni_ioctl (struct net_device *,struct ifreq *,int ); +static int sbni_siocdevprivate (struct net_device *,struct ifreq *, +void __user *,int );static void set_multicast_list (struct net_device * );static irqreturn_t sbni_interrupt (int ,void * );
@@ -211,7 +212,7 @@ static const struct net_device_ops sbni_netdev_ops = { .ndo_stop = sbni_close, .ndo_start_xmit = sbni_start_xmit, .ndo_set_rx_mode = set_multicast_list, - .ndo_do_ioctl = sbni_ioctl, + .ndo_siocdevprivate = sbni_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
@@ -1297,7 +1298,7 @@ sbni_card_probe( unsigned long ioaddr )/* -------------------------------------------------------------------------- */ static int -sbni_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd ) +sbni_siocdevprivate (struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd) {struct net_local *nl =netdev_priv (dev);struct sbni_flags flags;
@@ -1310,8 +1311,8 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd )switch ( cmd ) {case SIOCDEVGETINSTATS : -if (copy_to_user ( ifr->ifr_data, &nl->in_stats, -sizeof (struct sbni_in_stats ) )) +if (copy_to_user (data, &nl->in_stats, +sizeof (struct sbni_in_stats ))) error = -EFAULT ;break ;
@@ -1328,7 +1329,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd ) flags.rxl = nl->cur_rxl_index; flags.fixed_rxl = nl->delta_rxl ==0 ; -if (copy_to_user ( ifr->ifr_data, &flags,sizeof flags )) +if (copy_to_user (data, &flags,sizeof (flags))) error = -EFAULT ;break ;
@@ -1358,7 +1359,7 @@ sbni_ioctl( struct net_device *dev, struct ifreq *ifr, int cmd )if (!capable (CAP_NET_ADMIN ))return -EPERM ; -if (copy_from_user ( slave_name, ifr->ifr_data,sizeof slave_name )) +if (copy_from_user (slave_name, data,sizeof (slave_name)))return -EFAULT ; slave_dev =dev_get_by_name (&init_net, slave_name );if ( !slave_dev || !(slave_dev->flags &IFF_UP ) ) {
Signature · 1 line
2.29.2
PATCH v3 25/31 wan: cosa: remove dead cosa_net_ioctl() function
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The ndo_do_ioctl callback is never called with the COSAIO* commands, so this is never used. Call the hdlc_ioctl function directly instead.
Any user space code that relied on this function working as intended has never worked in a mainline kernel since before linux-1.0.
--- drivers/net/wan/cosa.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-)
drivers/net/wan/cosa.c +1 -14
@@ -267,7 +267,6 @@ static netdev_tx_t cosa_net_tx(struct sk_buff *skb, struct net_device *d);static char *cosa_net_setup_rx (struct channel_data *channel,int size);static int cosa_net_rx_done (struct channel_data *channel);static int cosa_net_tx_done (struct channel_data *channel,int size); -static int cosa_net_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd);/* Character device */ static char *chrdev_setup_rx (struct channel_data *channel,int size);
@@ -415,7 +414,7 @@ static const struct net_device_ops cosa_ops = { .ndo_open = cosa_net_open, .ndo_stop = cosa_net_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = cosa_net_ioctl, + .ndo_do_ioctl = hdlc_ioctl, .ndo_tx_timeout = cosa_net_timeout, };
@@ -1169,18 +1168,6 @@ static int cosa_ioctl_common(struct cosa_data *cosa,return -ENOIOCTLCMD ; } -static int cosa_net_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) -{ -int rv; -struct channel_data *chan =dev_to_chan (dev); - - rv =cosa_ioctl_common (chan->cosa, chan, cmd, - (unsigned long )ifr->ifr_data); -if (rv != -ENOIOCTLCMD ) -return rv; -return hdlc_ioctl (dev, ifr, cmd); -} -static long cosa_chardev_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {
Signature · 1 line
2.29.2
PATCH v3 26/31 dev_ioctl: pass SIOCDEVPRIVATE data separately
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
The compat handlers for SIOCDEVPRIVATE are incorrect for any driver that passes data as part of struct ifreq rather than as an ifr_data pointer, or that passes data back this way, since the compat_ifr_data_ioctl() helper overwrites the ifr_data pointer and does not copy anything back out.
Since all drivers using devprivate commands are now converted to the new .ndo_siocdevprivate callback, fix this by adding the missing piece and passing the pointer separately the whole way.
This further unifies the native and compat logic for socket ioctls, as the new code now passes the correct pointer as well as the correct data for both native and compat ioctls.
--- include/linux/netdevice.h | 4 +-- net/core/dev_ioctl.c | 22 +++++++++------- net/ethtool/ioctl.c | 3 +-- net/socket.c | 55 +++++++++------------------------------ 4 files changed, 28 insertions(+), 56 deletions(-)
include/linux/netdevice.h +2 -2
@@ -4012,9 +4012,9 @@ bool dev_valid_name(const char *name);int get_user_ifreq (struct ifreq *ifr,void __user **ifrdata,void __user *arg);int put_user_ifreq (struct ifreq *ifr,void __user *arg);int dev_ioctl (struct net *net,unsigned int cmd,struct ifreq *ifr, -bool *need_copyout); +void __user *data,bool *need_copyout);int dev_ifconf (struct net *net,struct ifconf __user *ifc); -int dev_ethtool (struct net *net,struct ifreq *); +int dev_ethtool (struct net *net,struct ifreq *ifr,void __user *userdata);unsigned int dev_get_flags (const struct net_device *);int __dev_change_flags (struct net_device *dev,unsigned int flags,struct netlink_ext_ack *extack);
net/core/dev_ioctl.c +12 -10
@@ -259,11 +259,10 @@ static int dev_do_ioctl(struct net_device *dev,return err; } -static int dev_siocdevprivate (struct net_device *dev, -struct ifreq *ifr,unsigned int cmd) +static int dev_siocdevprivate (struct net_device *dev,struct ifreq *ifr, +void __user *data,unsigned int cmd) {const struct net_device_ops *ops = dev->netdev_ops; -void __user *data = ifr->ifr_data;if (ops->ndo_siocdevprivate) {if (netif_device_present (dev))
@@ -273,13 +272,15 @@ static int dev_siocdevprivate(struct net_device *dev, }/* fall back to do_ioctl for drivers not yet converted */ + ifr->ifr_data = data;return dev_do_ioctl (dev, ifr, cmd); }/* * Perform the SIOCxIFxxx calls, inside rtnl_lock() */ -static int dev_ifsioc (struct net *net,struct ifreq *ifr,unsigned int cmd) +static int dev_ifsioc (struct net *net,struct ifreq *ifr,void __user *data, +unsigned int cmd) {int err;struct net_device *dev =__dev_get_by_name (net, ifr->ifr_name);
@@ -355,7 +356,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, unsigned int cmd)default :if (cmd >=SIOCDEVPRIVATE && cmd <=SIOCDEVPRIVATE +15 ) -return dev_siocdevprivate (dev, ifr, cmd); +return dev_siocdevprivate (dev, ifr, data, cmd); if (cmd == SIOCBONDENSLAVE || cmd == SIOCBONDRELEASE ||
@@ -424,7 +425,8 @@ EXPORT_SYMBOL(dev_load);* positive or a negative errno code on error. */ -int dev_ioctl (struct net *net,unsigned int cmd,struct ifreq *ifr,bool *need_copyout) +int dev_ioctl (struct net *net,unsigned int cmd,struct ifreq *ifr, +void __user *data,bool *need_copyout) {int ret;char *colon;
@@ -475,7 +477,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_ccase SIOCETHTOOL :dev_load (net, ifr->ifr_name);rtnl_lock (); - ret =dev_ethtool (net, ifr); + ret =dev_ethtool (net, ifr, data);rtnl_unlock ();if (colon) *colon =':' ;
@@ -494,7 +496,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_cif (!ns_capable (net->user_ns,CAP_NET_ADMIN ))return -EPERM ;rtnl_lock (); - ret =dev_ifsioc (net, ifr, cmd); + ret =dev_ifsioc (net, ifr, data, cmd);rtnl_unlock ();if (colon) *colon =':' ;
@@ -540,7 +542,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_ccase SIOCBONDINFOQUERY :dev_load (net, ifr->ifr_name);rtnl_lock (); - ret =dev_ifsioc (net, ifr, cmd); + ret =dev_ifsioc (net, ifr, data, cmd);rtnl_unlock ();if (need_copyout) *need_copyout = false;
@@ -565,7 +567,7 @@ int dev_ioctl(struct net *net, unsigned int cmd, struct ifreq *ifr, bool *need_c cmd <= SIOCDEVPRIVATE + 15)) {dev_load (net, ifr->ifr_name);rtnl_lock (); - ret =dev_ifsioc (net, ifr, cmd); + ret =dev_ifsioc (net, ifr, data, cmd);rtnl_unlock ();return ret; }
net/ethtool/ioctl.c +1 -2
@@ -2685,10 +2685,9 @@ static int ethtool_set_fecparam(struct net_device *dev, void __user *useraddr)/* The main entry point in this file. Called from net/core/dev_ioctl.c */ -int dev_ethtool (struct net *net,struct ifreq *ifr) +int dev_ethtool (struct net *net,struct ifreq *ifr,void __user *useraddr) {struct net_device *dev =__dev_get_by_name (net, ifr->ifr_name); -void __user *useraddr = ifr->ifr_data;u32 ethcmd, sub_cmd;int rc;netdev_features_t old_features;
net/socket.c +13 -42
99 lines not on this page · raw message
Signature · 1 line
2.29.2
PATCH v3 27/31 dev_ioctl: split out ndo_eth_ioctl
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Most users of ndo_do_ioctl are ethernet drivers that implement the MII commands SIOCGMIIPHY/SIOCGMIIREG/SIOCSMIIREG, or hardware timestamping with SIOCSHWTSTAMP/SIOCGHWTSTAMP.
Separate these from the few drivers that use ndo_do_ioctl to implement SIOCBOND, SIOCBR and SIOCWANDEV commands.
This is a purely cosmetic change intended to help readers find their way through the implementation.
--- Documentation/networking/netdevices.rst | 4 ++ Documentation/networking/timestamping.rst | 6 +-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 ++-- drivers/net/bonding/bond_main.c | 42 +++++++++++++------ drivers/net/ethernet/3com/3c574_cs.c | 2 +- drivers/net/ethernet/3com/3c59x.c | 4 +- drivers/net/ethernet/8390/ax88796.c | 2 +- drivers/net/ethernet/8390/axnet_cs.c | 2 +- drivers/net/ethernet/8390/pcnet_cs.c | 2 +- drivers/net/ethernet/actions/owl-emac.c | 6 +-- drivers/net/ethernet/adaptec/starfire.c | 2 +- drivers/net/ethernet/agere/et131x.c | 2 +- drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- drivers/net/ethernet/amd/amd8111e.c | 2 +- drivers/net/ethernet/amd/au1000_eth.c | 2 +- drivers/net/ethernet/amd/pcnet32.c | 2 +- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- .../net/ethernet/aquantia/atlantic/aq_main.c | 2 +- drivers/net/ethernet/arc/emac_main.c | 2 +- drivers/net/ethernet/atheros/ag71xx.c | 2 +- drivers/net/ethernet/atheros/alx/main.c | 2 +- .../net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- .../net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- drivers/net/ethernet/broadcom/b44.c | 2 +- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 4 +- drivers/net/ethernet/broadcom/bgmac.c | 2 +- drivers/net/ethernet/broadcom/bnx2.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- .../net/ethernet/broadcom/genet/bcmgenet.c | 2 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- drivers/net/ethernet/broadcom/tg3.c | 2 +- drivers/net/ethernet/cadence/macb_main.c | 4 +- .../net/ethernet/cavium/liquidio/lio_main.c | 2 +- .../ethernet/cavium/liquidio/lio_vf_main.c | 2 +- .../net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- .../net/ethernet/cavium/thunder/nicvf_main.c | 2 +- drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- .../net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- .../ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- drivers/net/ethernet/davicom/dm9000.c | 2 +- drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- drivers/net/ethernet/dlink/dl2k.c | 2 +- drivers/net/ethernet/dlink/sundance.c | 2 +- drivers/net/ethernet/dnet.c | 2 +- drivers/net/ethernet/ethoc.c | 2 +- drivers/net/ethernet/faraday/ftgmac100.c | 2 +- drivers/net/ethernet/faraday/ftmac100.c | 2 +- drivers/net/ethernet/fealnx.c | 2 +- .../net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- .../net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 +- .../net/ethernet/freescale/enetc/enetc_pf.c | 2 +- .../net/ethernet/freescale/enetc/enetc_vf.c | 2 +- drivers/net/ethernet/freescale/fec_main.c | 2 +- drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 +- .../ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 2 +- drivers/net/ethernet/freescale/ucc_geth.c | 2 +- drivers/net/ethernet/hisilicon/hisi_femac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- .../net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- drivers/net/ethernet/ibm/emac/core.c | 4 +- drivers/net/ethernet/ibm/ibmveth.c | 2 +- drivers/net/ethernet/intel/e100.c | 2 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 2 +- drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- drivers/net/ethernet/intel/ice/ice_main.c | 6 +-- drivers/net/ethernet/intel/igb/igb_main.c | 2 +- drivers/net/ethernet/intel/igbvf/netdev.c | 2 +- drivers/net/ethernet/intel/igc/igc_main.c | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- drivers/net/ethernet/jme.c | 2 +- drivers/net/ethernet/korina.c | 2 +- drivers/net/ethernet/lantiq_etop.c | 2 +- drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- drivers/net/ethernet/marvell/mvneta.c | 2 +- .../net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- .../ethernet/marvell/octeontx2/nic/otx2_pf.c | 2 +- drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- drivers/net/ethernet/marvell/skge.c | 2 +- drivers/net/ethernet/marvell/sky2.c | 4 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +- .../net/ethernet/mellanox/mlx4/en_netdev.c | 2 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 2 +- .../ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- .../mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +- .../mellanox/mlxbf_gige/mlxbf_gige_main.c | 4 +- .../net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- drivers/net/ethernet/micrel/ks8851_common.c | 2 +- drivers/net/ethernet/micrel/ksz884x.c | 2 +- drivers/net/ethernet/microchip/lan743x_main.c | 2 +- drivers/net/ethernet/mscc/ocelot_net.c | 2 +- drivers/net/ethernet/natsemi/natsemi.c | 2 +- drivers/net/ethernet/neterion/s2io.c | 2 +- .../net/ethernet/neterion/vxge/vxge-main.c | 2 +- drivers/net/ethernet/nxp/lpc_eth.c | 2 +- .../ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- drivers/net/ethernet/packetengines/hamachi.c | 2 +- .../net/ethernet/packetengines/yellowfin.c | 2 +- .../net/ethernet/pensando/ionic/ionic_lif.c | 4 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- drivers/net/ethernet/rdc/r6040.c | 2 +- drivers/net/ethernet/realtek/8139cp.c | 2 +- drivers/net/ethernet/realtek/8139too.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 2 +- drivers/net/ethernet/renesas/ravb_main.c | 2 +- drivers/net/ethernet/renesas/sh_eth.c | 4 +- .../net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- drivers/net/ethernet/sfc/efx.c | 2 +- drivers/net/ethernet/sfc/falcon/efx.c | 2 +- drivers/net/ethernet/sgi/ioc3-eth.c | 2 +- drivers/net/ethernet/sgi/meth.c | 2 +- drivers/net/ethernet/sis/sis190.c | 2 +- drivers/net/ethernet/sis/sis900.c | 2 +- drivers/net/ethernet/smsc/epic100.c | 2 +- drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- drivers/net/ethernet/smsc/smsc911x.c | 2 +- drivers/net/ethernet/smsc/smsc9420.c | 2 +- drivers/net/ethernet/socionext/netsec.c | 2 +- drivers/net/ethernet/socionext/sni_ave.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- drivers/net/ethernet/sun/cassini.c | 2 +- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/sun/sungem.c | 2 +- .../net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- drivers/net/ethernet/ti/cpmac.c | 2 +- drivers/net/ethernet/ti/cpsw.c | 2 +- drivers/net/ethernet/ti/cpsw_new.c | 2 +- drivers/net/ethernet/ti/davinci_emac.c | 2 +- drivers/net/ethernet/ti/netcp_core.c | 2 +- drivers/net/ethernet/ti/tlan.c | 2 +- drivers/net/ethernet/toshiba/spider_net.c | 2 +- drivers/net/ethernet/toshiba/tc35815.c | 2 +- drivers/net/ethernet/tundra/tsi108_eth.c | 2 +- drivers/net/ethernet/via/via-rhine.c | 2 +- drivers/net/ethernet/via/via-velocity.c | 2 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- .../net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- drivers/net/macvlan.c | 8 ++-- drivers/net/phy/phy.c | 4 +- drivers/net/usb/asix_devices.c | 6 +-- drivers/net/usb/ax88172a.c | 2 +- drivers/net/usb/ax88179_178a.c | 2 +- drivers/net/usb/dm9601.c | 2 +- drivers/net/usb/lan78xx.c | 2 +- drivers/net/usb/mcs7830.c | 2 +- drivers/net/usb/r8152.c | 2 +- drivers/net/usb/smsc75xx.c | 2 +- drivers/net/usb/smsc95xx.c | 2 +- drivers/net/usb/sr9700.c | 2 +- drivers/net/usb/sr9800.c | 2 +- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 4 +- drivers/staging/octeon/ethernet.c | 12 +++--- include/linux/netdevice.h | 6 +++ include/net/dsa.h | 14 +++---- net/8021q/vlan_dev.c | 6 +-- net/core/dev_ioctl.c | 38 ++++++++++++----- net/dsa/master.c | 6 +-- net/dsa/slave.c | 2 +- 172 files changed, 273 insertions(+), 231 deletions(-)
Documentation/networking/netdevices.rst +4 -0
@@ -229,6 +229,10 @@ ndo_siocdevprivate: This is used to implement SIOCDEVPRIVATE ioctl helpers. These should not be added to new drivers, so don't use. +ndo_eth_ioctl: + Synchronization: rtnl_lock() semaphore. + Context: process + ndo_get_stats: Synchronization: rtnl_lock() semaphore, dev_base_lock rwlock, or RCU. Context: atomic (can't sleep under rwlock or RCU)
Documentation/networking/timestamping.rst +3 -3
@@ -625,7 +625,7 @@ interfaces of a DSA switch to share the same PHC. By design, PTP timestamping with a DSA switch does not need any special handling in the driver for the host port it is attached to. However, when the host port also supports PTP timestamping, DSA will take care of intercepting -the ``.ndo_do_ioctl`` calls towards the host port, and block attempts to enable +the ``.ndo_eth_ioctl`` calls towards the host port, and block attempts to enable hardware timestamping on it. This is because the SO_TIMESTAMPING API does not allow the delivery of multiple hardware timestamps for the same packet, so anybody else except for the DSA switch port must be prevented from doing so.
@@ -688,7 +688,7 @@ ethtool ioctl operations for them need to be mediated by their respective MAC driver. Therefore, as opposed to DSA switches, modifications need to be done to each individual MAC driver for PHY timestamping support. This entails: -- Checking, in ``.ndo_do_ioctl``, whether ``phy_has_hwtstamp(netdev->phydev)`` +- Checking, in ``.ndo_eth_ioctl``, whether ``phy_has_hwtstamp(netdev->phydev)`` is true or not. If it is, then the MAC driver should not process this request but instead pass it on to the PHY using ``phy_mii_ioctl()``.
@@ -747,7 +747,7 @@ For example, a typical driver design for TX timestamping might be to split the transmission part into 2 portions: 1. "TX": checks whether PTP timestamping has been previously enabled through - the ``.ndo_do_ioctl`` ("``priv->hwtstamp_tx_enabled == true``") and the + the ``.ndo_eth_ioctl`` ("``priv->hwtstamp_tx_enabled == true``") and the current skb requires a TX timestamp ("``skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP``"). If this is true, it sets the "``skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS``" flag. Note: as
drivers/infiniband/ulp/ipoib/ipoib_main.c +4 -4
@@ -1745,10 +1745,10 @@ static int ipoib_ioctl(struct net_device *dev, struct ifreq *ifr, {struct ipoib_dev_priv *priv =ipoib_priv (dev); -if (!priv->rn_ops->ndo_do_ioctl) +if (!priv->rn_ops->ndo_eth_ioctl)return -EOPNOTSUPP ; -return priv->rn_ops->ndo_do_ioctl (dev, ifr, cmd); +return priv->rn_ops->ndo_eth_ioctl (dev, ifr, cmd); }static int ipoib_dev_init (struct net_device *dev)
@@ -2078,7 +2078,7 @@ static const struct net_device_ops ipoib_netdev_ops_pf = { .ndo_set_vf_guid = ipoib_set_vf_guid, .ndo_set_mac_address = ipoib_set_mac, .ndo_get_stats64 = ipoib_get_stats, - .ndo_do_ioctl = ipoib_ioctl, + .ndo_eth_ioctl = ipoib_ioctl, };static const struct net_device_ops ipoib_netdev_ops_vf = {
@@ -2093,7 +2093,7 @@ static const struct net_device_ops ipoib_netdev_ops_vf = { .ndo_set_rx_mode = ipoib_set_mcast_list, .ndo_get_iflink = ipoib_get_iflink, .ndo_get_stats64 = ipoib_get_stats, - .ndo_do_ioctl = ipoib_ioctl, + .ndo_eth_ioctl = ipoib_ioctl, };static const struct net_device_ops ipoib_netdev_default_pf = {
drivers/net/bonding/bond_main.c +29 -13
82 lines not on this page · raw message
drivers/net/ethernet/3com/3c574_cs.c +1 -1
@@ -252,7 +252,7 @@ static const struct net_device_ops el3_netdev_ops = { .ndo_start_xmit = el3_start_xmit, .ndo_tx_timeout = el3_tx_timeout, .ndo_get_stats = el3_get_stats, - .ndo_do_ioctl = el3_ioctl, + .ndo_eth_ioctl = el3_ioctl, .ndo_set_rx_mode = set_multicast_list, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/3com/3c59x.c +2 -2
@@ -1052,7 +1052,7 @@ static const struct net_device_ops boomrang_netdev_ops = { .ndo_tx_timeout = vortex_tx_timeout, .ndo_get_stats = vortex_get_stats, #ifdef CONFIG_PCI - .ndo_do_ioctl = vortex_ioctl, + .ndo_eth_ioctl = vortex_ioctl, #endif .ndo_set_rx_mode = set_rx_mode, .ndo_set_mac_address = eth_mac_addr,
@@ -1069,7 +1069,7 @@ static const struct net_device_ops vortex_netdev_ops = { .ndo_tx_timeout = vortex_tx_timeout, .ndo_get_stats = vortex_get_stats, #ifdef CONFIG_PCI - .ndo_do_ioctl = vortex_ioctl, + .ndo_eth_ioctl = vortex_ioctl, #endif .ndo_set_rx_mode = set_rx_mode, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/8390/ax88796.c +1 -1
@@ -635,7 +635,7 @@ static void ax_eeprom_register_write(struct eeprom_93cx6 *eeprom)static const struct net_device_ops ax_netdev_ops = { .ndo_open = ax_open, .ndo_stop = ax_close, - .ndo_do_ioctl = ax_ioctl, + .ndo_eth_ioctl = ax_ioctl, .ndo_start_xmit = ax_ei_start_xmit, .ndo_tx_timeout = ax_ei_tx_timeout,
drivers/net/ethernet/8390/axnet_cs.c +1 -1
@@ -128,7 +128,7 @@ static inline struct axnet_dev *PRIV(struct net_device *dev)static const struct net_device_ops axnet_netdev_ops = { .ndo_open = axnet_open, .ndo_stop = axnet_close, - .ndo_do_ioctl = axnet_ioctl, + .ndo_eth_ioctl = axnet_ioctl, .ndo_start_xmit = axnet_start_xmit, .ndo_tx_timeout = axnet_tx_timeout, .ndo_get_stats = get_stats,
drivers/net/ethernet/8390/pcnet_cs.c +1 -1
@@ -223,7 +223,7 @@ static const struct net_device_ops pcnet_netdev_ops = { .ndo_set_config = set_config, .ndo_start_xmit = ei_start_xmit, .ndo_get_stats = ei_get_stats, - .ndo_do_ioctl = ei_ioctl, + .ndo_eth_ioctl = ei_ioctl, .ndo_set_rx_mode = ei_set_multicast_list, .ndo_tx_timeout = ei_tx_timeout, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/actions/owl-emac.c +3 -3
@@ -1179,8 +1179,8 @@ static int owl_emac_ndo_set_mac_addr(struct net_device *netdev, void *addr)return owl_emac_setup_frame_xmit (netdev_priv (netdev)); } -static int owl_emac_ndo_do_ioctl (struct net_device *netdev, -struct ifreq *req,int cmd) +static int owl_emac_ndo_eth_ioctl (struct net_device *netdev, +struct ifreq *req,int cmd) {if (!netif_running (netdev))return -EINVAL ;
@@ -1224,7 +1224,7 @@ static const struct net_device_ops owl_emac_netdev_ops = { .ndo_set_rx_mode = owl_emac_ndo_set_rx_mode, .ndo_set_mac_address = owl_emac_ndo_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = owl_emac_ndo_do_ioctl, + .ndo_eth_ioctl = owl_emac_ndo_eth_ioctl, .ndo_tx_timeout = owl_emac_ndo_tx_timeout, .ndo_get_stats = owl_emac_ndo_get_stats, };
drivers/net/ethernet/adaptec/starfire.c +1 -1
@@ -625,7 +625,7 @@ static const struct net_device_ops netdev_ops = { .ndo_tx_timeout = tx_timeout, .ndo_get_stats = get_stats, .ndo_set_rx_mode = set_rx_mode, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,#ifdef VLAN_SUPPORT
drivers/net/ethernet/agere/et131x.c +1 -1
@@ -3882,7 +3882,7 @@ static const struct net_device_ops et131x_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, .ndo_get_stats = et131x_stats, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, }; static int et131x_pci_setup(struct pci_dev *pdev,
drivers/net/ethernet/allwinner/sun4i-emac.c +1 -1
@@ -774,7 +774,7 @@ static const struct net_device_ops emac_netdev_ops = { .ndo_start_xmit = emac_start_xmit, .ndo_tx_timeout = emac_timeout, .ndo_set_rx_mode = emac_set_rx_mode, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = emac_set_mac_address,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/amd/amd8111e.c +1 -1
@@ -1729,7 +1729,7 @@ static const struct net_device_ops amd8111e_netdev_ops = { .ndo_set_rx_mode = amd8111e_set_multicast_list, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = amd8111e_set_mac_address, - .ndo_do_ioctl = amd8111e_ioctl, + .ndo_eth_ioctl = amd8111e_ioctl, .ndo_change_mtu = amd8111e_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = amd8111e_poll,
drivers/net/ethernet/amd/au1000_eth.c +1 -1
@@ -1051,7 +1051,7 @@ static const struct net_device_ops au1000_netdev_ops = { .ndo_stop = au1000_close, .ndo_start_xmit = au1000_tx, .ndo_set_rx_mode = au1000_multicast_list, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_tx_timeout = au1000_tx_timeout, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/amd/pcnet32.c +1 -1
@@ -1572,7 +1572,7 @@ static const struct net_device_ops pcnet32_netdev_ops = { .ndo_tx_timeout = pcnet32_tx_timeout, .ndo_get_stats = pcnet32_get_stats, .ndo_set_rx_mode = pcnet32_set_multicast_list, - .ndo_do_ioctl = pcnet32_ioctl, + .ndo_eth_ioctl = pcnet32_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -1
@@ -2284,7 +2284,7 @@ static const struct net_device_ops xgbe_netdev_ops = { .ndo_set_rx_mode = xgbe_set_rx_mode, .ndo_set_mac_address = xgbe_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = xgbe_ioctl, + .ndo_eth_ioctl = xgbe_ioctl, .ndo_change_mtu = xgbe_change_mtu, .ndo_tx_timeout = xgbe_tx_timeout, .ndo_get_stats64 = xgbe_get_stats64,
drivers/net/ethernet/aquantia/atlantic/aq_main.c +1 -1
@@ -421,7 +421,7 @@ static const struct net_device_ops aq_ndev_ops = { .ndo_change_mtu = aq_ndev_change_mtu, .ndo_set_mac_address = aq_ndev_set_mac_address, .ndo_set_features = aq_ndev_set_features, - .ndo_do_ioctl = aq_ndev_ioctl, + .ndo_eth_ioctl = aq_ndev_ioctl, .ndo_vlan_rx_add_vid = aq_ndo_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = aq_ndo_vlan_rx_kill_vid, .ndo_setup_tc = aq_ndo_setup_tc,
drivers/net/ethernet/arc/emac_main.c +1 -1
@@ -844,7 +844,7 @@ static const struct net_device_ops arc_emac_netdev_ops = { .ndo_set_mac_address = arc_emac_set_address, .ndo_get_stats = arc_emac_stats, .ndo_set_rx_mode = arc_emac_set_rx_mode, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = arc_emac_poll_controller,#endif
drivers/net/ethernet/atheros/ag71xx.c +1 -1
@@ -1851,7 +1851,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_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_tx_timeout = ag71xx_tx_timeout, .ndo_change_mtu = ag71xx_change_mtu, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/atheros/alx/main.c +1 -1
@@ -1701,7 +1701,7 @@ static const struct net_device_ops alx_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = alx_set_mac_address, .ndo_change_mtu = alx_change_mtu, - .ndo_do_ioctl = alx_ioctl, + .ndo_eth_ioctl = alx_ioctl, .ndo_tx_timeout = alx_tx_timeout, .ndo_fix_features = alx_fix_features,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -1
@@ -2609,7 +2609,7 @@ static const struct net_device_ops atl1c_netdev_ops = { .ndo_change_mtu = atl1c_change_mtu, .ndo_fix_features = atl1c_fix_features, .ndo_set_features = atl1c_set_features, - .ndo_do_ioctl = atl1c_ioctl, + .ndo_eth_ioctl = atl1c_ioctl, .ndo_tx_timeout = atl1c_tx_timeout, .ndo_get_stats = atl1c_get_stats,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +1 -1
@@ -2247,7 +2247,7 @@ static const struct net_device_ops atl1e_netdev_ops = { .ndo_fix_features = atl1e_fix_features, .ndo_set_features = atl1e_set_features, .ndo_change_mtu = atl1e_change_mtu, - .ndo_do_ioctl = atl1e_ioctl, + .ndo_eth_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = atl1e_netpoll,
drivers/net/ethernet/atheros/atlx/atl1.c +1 -1
@@ -2885,7 +2885,7 @@ static const struct net_device_ops atl1_netdev_ops = { .ndo_change_mtu = atl1_change_mtu, .ndo_fix_features = atlx_fix_features, .ndo_set_features = atlx_set_features, - .ndo_do_ioctl = atlx_ioctl, + .ndo_eth_ioctl = atlx_ioctl, .ndo_tx_timeout = atlx_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = atl1_poll_controller,
drivers/net/ethernet/atheros/atlx/atl2.c +1 -1
@@ -1293,7 +1293,7 @@ static const struct net_device_ops atl2_netdev_ops = { .ndo_change_mtu = atl2_change_mtu, .ndo_fix_features = atl2_fix_features, .ndo_set_features = atl2_set_features, - .ndo_do_ioctl = atl2_ioctl, + .ndo_eth_ioctl = atl2_ioctl, .ndo_tx_timeout = atl2_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = atl2_poll_controller,
drivers/net/ethernet/broadcom/b44.c +1 -1
@@ -2198,7 +2198,7 @@ static const struct net_device_ops b44_netdev_ops = { .ndo_set_rx_mode = b44_set_rx_mode, .ndo_set_mac_address = b44_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = b44_ioctl, + .ndo_eth_ioctl = b44_ioctl, .ndo_tx_timeout = b44_tx_timeout, .ndo_change_mtu = b44_change_mtu,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/broadcom/bcm63xx_enet.c +2 -2
@@ -1699,7 +1699,7 @@ static const struct net_device_ops bcm_enet_ops = { .ndo_start_xmit = bcm_enet_start_xmit, .ndo_set_mac_address = bcm_enet_set_mac_address, .ndo_set_rx_mode = bcm_enet_set_multicast_list, - .ndo_do_ioctl = bcm_enet_ioctl, + .ndo_eth_ioctl = bcm_enet_ioctl, .ndo_change_mtu = bcm_enet_change_mtu, };
@@ -2446,7 +2446,7 @@ static const struct net_device_ops bcm_enetsw_ops = { .ndo_stop = bcm_enetsw_stop, .ndo_start_xmit = bcm_enet_start_xmit, .ndo_change_mtu = bcm_enet_change_mtu, - .ndo_do_ioctl = bcm_enetsw_ioctl, + .ndo_eth_ioctl = bcm_enetsw_ioctl, };
drivers/net/ethernet/broadcom/bgmac.c +1 -1
@@ -1263,7 +1263,7 @@ static const struct net_device_ops bgmac_netdev_ops = { .ndo_set_rx_mode = bgmac_set_rx_mode, .ndo_set_mac_address = bgmac_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_change_mtu = bgmac_change_mtu, };
drivers/net/ethernet/broadcom/bnx2.c +1 -1
@@ -8546,7 +8546,7 @@ static const struct net_device_ops bnx2_netdev_ops = { .ndo_stop = bnx2_close, .ndo_get_stats64 = bnx2_get_stats64, .ndo_set_rx_mode = bnx2_set_rx_mode, - .ndo_do_ioctl = bnx2_ioctl, + .ndo_eth_ioctl = bnx2_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = bnx2_change_mac_addr, .ndo_change_mtu = bnx2_change_mtu,
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +1 -1
@@ -13048,7 +13048,7 @@ static const struct net_device_ops bnx2x_netdev_ops = { .ndo_set_rx_mode = bnx2x_set_rx_mode, .ndo_set_mac_address = bnx2x_change_mac_addr, .ndo_validate_addr = bnx2x_validate_addr, - .ndo_do_ioctl = bnx2x_ioctl, + .ndo_eth_ioctl = bnx2x_ioctl, .ndo_change_mtu = bnx2x_change_mtu, .ndo_fix_features = bnx2x_fix_features, .ndo_set_features = bnx2x_set_features,
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -12667,7 +12667,7 @@ static const struct net_device_ops bnxt_netdev_ops = { .ndo_stop = bnxt_close, .ndo_get_stats64 = bnxt_get_stats64, .ndo_set_rx_mode = bnxt_set_rx_mode, - .ndo_do_ioctl = bnxt_ioctl, + .ndo_eth_ioctl = bnxt_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = bnxt_change_mac_addr, .ndo_change_mtu = bnxt_change_mtu,
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
@@ -3659,7 +3659,7 @@ static const struct net_device_ops bcmgenet_netdev_ops = { .ndo_tx_timeout = bcmgenet_timeout, .ndo_set_rx_mode = bcmgenet_set_rx_mode, .ndo_set_mac_address = bcmgenet_set_mac_addr, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_features = bcmgenet_set_features, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = bcmgenet_poll_controller,
drivers/net/ethernet/broadcom/sb1250-mac.c +1 -1
@@ -2136,7 +2136,7 @@ static const struct net_device_ops sbmac_netdev_ops = { .ndo_start_xmit = sbmac_start_tx, .ndo_set_rx_mode = sbmac_set_rx_mode, .ndo_tx_timeout = sbmac_tx_timeout, - .ndo_do_ioctl = sbmac_mii_ioctl, + .ndo_eth_ioctl = sbmac_mii_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/broadcom/tg3.c +1 -1
@@ -14290,7 +14290,7 @@ static const struct net_device_ops tg3_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = tg3_set_rx_mode, .ndo_set_mac_address = tg3_set_mac_addr, - .ndo_do_ioctl = tg3_ioctl, + .ndo_eth_ioctl = tg3_ioctl, .ndo_tx_timeout = tg3_tx_timeout, .ndo_change_mtu = tg3_change_mtu, .ndo_fix_features = tg3_fix_features,
drivers/net/ethernet/cadence/macb_main.c +2 -2
@@ -3664,7 +3664,7 @@ static const struct net_device_ops macb_netdev_ops = { .ndo_start_xmit = macb_start_xmit, .ndo_set_rx_mode = macb_set_rx_mode, .ndo_get_stats = macb_get_stats, - .ndo_do_ioctl = macb_ioctl, + .ndo_eth_ioctl = macb_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = macb_change_mtu, .ndo_set_mac_address = eth_mac_addr,
@@ -4323,7 +4323,7 @@ static const struct net_device_ops at91ether_netdev_ops = { .ndo_get_stats = macb_get_stats, .ndo_set_rx_mode = macb_set_rx_mode, .ndo_set_mac_address = eth_mac_addr, - .ndo_do_ioctl = macb_ioctl, + .ndo_eth_ioctl = macb_ioctl, .ndo_validate_addr = eth_validate_addr, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = at91ether_poll_controller,
drivers/net/ethernet/cavium/liquidio/lio_main.c +1 -1
@@ -3223,7 +3223,7 @@ static const struct net_device_ops lionetdevops = { .ndo_vlan_rx_add_vid = liquidio_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = liquidio_vlan_rx_kill_vid, .ndo_change_mtu = liquidio_change_mtu, - .ndo_do_ioctl = liquidio_ioctl, + .ndo_eth_ioctl = liquidio_ioctl, .ndo_fix_features = liquidio_fix_features, .ndo_set_features = liquidio_set_features, .ndo_set_vf_mac = liquidio_set_vf_mac,
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1 -1
@@ -1889,7 +1889,7 @@ static const struct net_device_ops lionetdevops = { .ndo_vlan_rx_add_vid = liquidio_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = liquidio_vlan_rx_kill_vid, .ndo_change_mtu = liquidio_change_mtu, - .ndo_do_ioctl = liquidio_ioctl, + .ndo_eth_ioctl = liquidio_ioctl, .ndo_fix_features = liquidio_fix_features, .ndo_set_features = liquidio_set_features, };
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c +1 -1
@@ -1373,7 +1373,7 @@ static const struct net_device_ops octeon_mgmt_ops = { .ndo_start_xmit = octeon_mgmt_xmit, .ndo_set_rx_mode = octeon_mgmt_set_rx_filtering, .ndo_set_mac_address = octeon_mgmt_set_mac_address, - .ndo_do_ioctl = octeon_mgmt_ioctl, + .ndo_eth_ioctl = octeon_mgmt_ioctl, .ndo_change_mtu = octeon_mgmt_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = octeon_mgmt_poll_controller,
drivers/net/ethernet/cavium/thunder/nicvf_main.c +1 -1
@@ -2096,7 +2096,7 @@ static const struct net_device_ops nicvf_netdev_ops = { .ndo_fix_features = nicvf_fix_features, .ndo_set_features = nicvf_set_features, .ndo_bpf = nicvf_xdp, - .ndo_do_ioctl = nicvf_ioctl, + .ndo_eth_ioctl = nicvf_ioctl, .ndo_set_rx_mode = nicvf_set_rx_mode, };
drivers/net/ethernet/chelsio/cxgb/cxgb2.c +1 -1
@@ -924,7 +924,7 @@ static const struct net_device_ops cxgb_netdev_ops = { .ndo_get_stats = t1_get_stats, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = t1_set_rxmode, - .ndo_do_ioctl = t1_ioctl, + .ndo_eth_ioctl = t1_ioctl, .ndo_change_mtu = t1_change_mtu, .ndo_set_mac_address = t1_set_mac_addr, .ndo_fix_features = t1_fix_features,
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +1 -1
@@ -3184,7 +3184,7 @@ static const struct net_device_ops cxgb_netdev_ops = { .ndo_get_stats = cxgb_get_stats, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = cxgb_set_rxmode, - .ndo_do_ioctl = cxgb_ioctl, + .ndo_eth_ioctl = cxgb_ioctl, .ndo_siocdevprivate = cxgb_siocdevprivate, .ndo_change_mtu = cxgb_change_mtu, .ndo_set_mac_address = cxgb_set_mac_addr,
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
@@ -3872,7 +3872,7 @@ static const struct net_device_ops cxgb4_netdev_ops = { .ndo_set_mac_address = cxgb_set_mac_addr, .ndo_set_features = cxgb_set_features, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = cxgb_ioctl, + .ndo_eth_ioctl = cxgb_ioctl, .ndo_change_mtu = cxgb_change_mtu, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = cxgb_netpoll,
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +1 -1
@@ -2837,7 +2837,7 @@ static const struct net_device_ops cxgb4vf_netdev_ops = { .ndo_set_rx_mode = cxgb4vf_set_rxmode, .ndo_set_mac_address = cxgb4vf_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = cxgb4vf_do_ioctl, + .ndo_eth_ioctl = cxgb4vf_do_ioctl, .ndo_change_mtu = cxgb4vf_change_mtu, .ndo_fix_features = cxgb4vf_fix_features, .ndo_set_features = cxgb4vf_set_features,
drivers/net/ethernet/cirrus/ep93xx_eth.c +1 -1
@@ -733,7 +733,7 @@ static const struct net_device_ops ep93xx_netdev_ops = { .ndo_open = ep93xx_open, .ndo_stop = ep93xx_close, .ndo_start_xmit = ep93xx_xmit, - .ndo_do_ioctl = ep93xx_ioctl, + .ndo_eth_ioctl = ep93xx_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, };
drivers/net/ethernet/davicom/dm9000.c +1 -1
@@ -1372,7 +1372,7 @@ static const struct net_device_ops dm9000_netdev_ops = { .ndo_start_xmit = dm9000_start_xmit, .ndo_tx_timeout = dm9000_timeout, .ndo_set_rx_mode = dm9000_hash_table, - .ndo_do_ioctl = dm9000_ioctl, + .ndo_eth_ioctl = dm9000_ioctl, .ndo_set_features = dm9000_set_features, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/dec/tulip/tulip_core.c +1 -1
@@ -1271,7 +1271,7 @@ static const struct net_device_ops tulip_netdev_ops = { .ndo_tx_timeout = tulip_tx_timeout, .ndo_stop = tulip_close, .ndo_get_stats = tulip_get_stats, - .ndo_do_ioctl = private_ioctl, + .ndo_eth_ioctl = private_ioctl, .ndo_set_rx_mode = set_rx_mode, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/dec/tulip/winbond-840.c +1 -1
@@ -341,7 +341,7 @@ static const struct net_device_ops netdev_ops = { .ndo_start_xmit = start_tx, .ndo_get_stats = get_stats, .ndo_set_rx_mode = set_rx_mode, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_tx_timeout = tx_timeout, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/dlink/dl2k.c +1 -1
@@ -95,7 +95,7 @@ static const struct net_device_ops netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_set_rx_mode = set_multicast, - .ndo_do_ioctl = rio_ioctl, + .ndo_eth_ioctl = rio_ioctl, .ndo_tx_timeout = rio_tx_timeout, };
drivers/net/ethernet/dlink/sundance.c +1 -1
@@ -479,7 +479,7 @@ static const struct net_device_ops netdev_ops = { .ndo_start_xmit = start_tx, .ndo_get_stats = get_stats, .ndo_set_rx_mode = set_rx_mode, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_tx_timeout = tx_timeout, .ndo_change_mtu = change_mtu, .ndo_set_mac_address = sundance_set_mac_addr,
drivers/net/ethernet/dnet.c +1 -1
@@ -742,7 +742,7 @@ static const struct net_device_ops dnet_netdev_ops = { .ndo_stop = dnet_close, .ndo_get_stats = dnet_get_stats, .ndo_start_xmit = dnet_start_xmit, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
drivers/net/ethernet/ethoc.c +1 -1
@@ -1009,7 +1009,7 @@ static const struct ethtool_ops ethoc_ethtool_ops = {static const struct net_device_ops ethoc_netdev_ops = { .ndo_open = ethoc_open, .ndo_stop = ethoc_stop, - .ndo_do_ioctl = ethoc_ioctl, + .ndo_eth_ioctl = ethoc_ioctl, .ndo_set_mac_address = ethoc_set_mac_address, .ndo_set_rx_mode = ethoc_set_multicast_list, .ndo_change_mtu = ethoc_change_mtu,
drivers/net/ethernet/faraday/ftgmac100.c +1 -1
@@ -1616,7 +1616,7 @@ static const struct net_device_ops ftgmac100_netdev_ops = { .ndo_start_xmit = ftgmac100_hard_start_xmit, .ndo_set_mac_address = ftgmac100_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_tx_timeout = ftgmac100_tx_timeout, .ndo_set_rx_mode = ftgmac100_set_rx_mode, .ndo_set_features = ftgmac100_set_features,
drivers/net/ethernet/faraday/ftmac100.c +1 -1
@@ -1043,7 +1043,7 @@ static const struct net_device_ops ftmac100_netdev_ops = { .ndo_start_xmit = ftmac100_hard_start_xmit, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = ftmac100_do_ioctl, + .ndo_eth_ioctl = ftmac100_do_ioctl, };/******************************************************************************
drivers/net/ethernet/fealnx.c +1 -1
@@ -463,7 +463,7 @@ static const struct net_device_ops netdev_ops = { .ndo_start_xmit = start_tx, .ndo_get_stats = get_stats, .ndo_set_rx_mode = set_rx_mode, - .ndo_do_ioctl = mii_ioctl, + .ndo_eth_ioctl = mii_ioctl, .ndo_tx_timeout = fealnx_tx_timeout, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +1 -1
@@ -3157,7 +3157,7 @@ static const struct net_device_ops dpaa_ops = { .ndo_set_mac_address = dpaa_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = dpaa_set_rx_mode, - .ndo_do_ioctl = dpaa_ioctl, + .ndo_eth_ioctl = dpaa_ioctl, .ndo_setup_tc = dpaa_setup_tc, .ndo_change_mtu = dpaa_change_mtu, .ndo_bpf = dpaa_xdp,
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +1 -1
@@ -2594,7 +2594,7 @@ static const struct net_device_ops dpaa2_eth_ops = { .ndo_get_stats64 = dpaa2_eth_get_stats, .ndo_set_rx_mode = dpaa2_eth_set_rx_mode, .ndo_set_features = dpaa2_eth_set_features, - .ndo_do_ioctl = dpaa2_eth_ioctl, + .ndo_eth_ioctl = dpaa2_eth_ioctl, .ndo_change_mtu = dpaa2_eth_change_mtu, .ndo_bpf = dpaa2_eth_xdp, .ndo_xdp_xmit = dpaa2_eth_xdp_xmit,
drivers/net/ethernet/freescale/enetc/enetc_pf.c +1 -1
@@ -735,7 +735,7 @@ static const struct net_device_ops enetc_ndev_ops = { .ndo_set_vf_vlan = enetc_pf_set_vf_vlan, .ndo_set_vf_spoofchk = enetc_pf_set_vf_spoofchk, .ndo_set_features = enetc_pf_set_features, - .ndo_do_ioctl = enetc_ioctl, + .ndo_eth_ioctl = enetc_ioctl, .ndo_setup_tc = enetc_setup_tc, .ndo_bpf = enetc_setup_bpf, .ndo_xdp_xmit = enetc_xdp_xmit,
drivers/net/ethernet/freescale/enetc/enetc_vf.c +1 -1
@@ -99,7 +99,7 @@ static const struct net_device_ops enetc_ndev_ops = { .ndo_get_stats = enetc_get_stats, .ndo_set_mac_address = enetc_vf_set_mac_addr, .ndo_set_features = enetc_vf_set_features, - .ndo_do_ioctl = enetc_ioctl, + .ndo_eth_ioctl = enetc_ioctl, .ndo_setup_tc = enetc_setup_tc, };
drivers/net/ethernet/freescale/fec_main.c +1 -1
@@ -3280,7 +3280,7 @@ static const struct net_device_ops fec_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_tx_timeout = fec_timeout, .ndo_set_mac_address = fec_set_mac_address, - .ndo_do_ioctl = fec_enet_ioctl, + .ndo_eth_ioctl = fec_enet_ioctl,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = fec_poll_controller,#endif
drivers/net/ethernet/freescale/fec_mpc52xx.c +1 -1
@@ -792,7 +792,7 @@ static const struct net_device_ops mpc52xx_fec_netdev_ops = { .ndo_set_rx_mode = mpc52xx_fec_set_multicast_list, .ndo_set_mac_address = mpc52xx_fec_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_tx_timeout = mpc52xx_fec_tx_timeout, .ndo_get_stats = mpc52xx_fec_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -1
@@ -900,7 +900,7 @@ static const struct net_device_ops fs_enet_netdev_ops = { .ndo_start_xmit = fs_enet_start_xmit, .ndo_tx_timeout = fs_timeout, .ndo_set_rx_mode = fs_set_multicast_list, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/freescale/gianfar.c +1 -1
@@ -3184,7 +3184,7 @@ static const struct net_device_ops gfar_netdev_ops = { .ndo_set_features = gfar_set_features, .ndo_set_rx_mode = gfar_set_multi, .ndo_tx_timeout = gfar_timeout, - .ndo_do_ioctl = gfar_ioctl, + .ndo_eth_ioctl = gfar_ioctl, .ndo_get_stats64 = gfar_get_stats64, .ndo_change_carrier = fixed_phy_change_carrier, .ndo_set_mac_address = gfar_set_mac_addr,
drivers/net/ethernet/freescale/ucc_geth.c +1 -1
@@ -3516,7 +3516,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = { .ndo_set_mac_address = ucc_geth_set_mac_addr, .ndo_set_rx_mode = ucc_geth_set_multi, .ndo_tx_timeout = ucc_geth_timeout, - .ndo_do_ioctl = ucc_geth_ioctl, + .ndo_eth_ioctl = ucc_geth_ioctl,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = ucc_netpoll,#endif
drivers/net/ethernet/hisilicon/hisi_femac.c +1 -1
@@ -685,7 +685,7 @@ static const struct net_device_ops hisi_femac_netdev_ops = { .ndo_open = hisi_femac_net_open, .ndo_stop = hisi_femac_net_close, .ndo_start_xmit = hisi_femac_net_xmit, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_mac_address = hisi_femac_set_mac_address, .ndo_set_rx_mode = hisi_femac_net_set_rx_mode, };
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -1945,7 +1945,7 @@ static const struct net_device_ops hns_nic_netdev_ops = { .ndo_tx_timeout = hns_nic_net_timeout, .ndo_set_mac_address = hns_nic_net_set_mac_address, .ndo_change_mtu = hns_nic_change_mtu, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_features = hns_nic_set_features, .ndo_fix_features = hns_nic_fix_features, .ndo_get_stats64 = hns_nic_get_stats64,
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -2852,7 +2852,7 @@ static const struct net_device_ops hns3_nic_netdev_ops = { .ndo_start_xmit = hns3_nic_net_xmit, .ndo_tx_timeout = hns3_nic_net_timeout, .ndo_set_mac_address = hns3_nic_net_set_mac_address, - .ndo_do_ioctl = hns3_nic_do_ioctl, + .ndo_eth_ioctl = hns3_nic_do_ioctl, .ndo_change_mtu = hns3_nic_change_mtu, .ndo_set_features = hns3_nic_set_features, .ndo_features_check = hns3_features_check,
drivers/net/ethernet/ibm/emac/core.c +2 -2
@@ -3011,7 +3011,7 @@ static const struct net_device_ops emac_netdev_ops = { .ndo_stop = emac_close, .ndo_get_stats = emac_stats, .ndo_set_rx_mode = emac_set_multicast_list, - .ndo_do_ioctl = emac_ioctl, + .ndo_eth_ioctl = emac_ioctl, .ndo_tx_timeout = emac_tx_timeout, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = emac_set_mac_address,
@@ -3023,7 +3023,7 @@ static const struct net_device_ops emac_gige_netdev_ops = { .ndo_stop = emac_close, .ndo_get_stats = emac_stats, .ndo_set_rx_mode = emac_set_multicast_list, - .ndo_do_ioctl = emac_ioctl, + .ndo_eth_ioctl = emac_ioctl, .ndo_tx_timeout = emac_tx_timeout, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = emac_set_mac_address,
drivers/net/ethernet/ibm/ibmveth.c +1 -1
@@ -1630,7 +1630,7 @@ static const struct net_device_ops ibmveth_netdev_ops = { .ndo_stop = ibmveth_close, .ndo_start_xmit = ibmveth_start_xmit, .ndo_set_rx_mode = ibmveth_set_multicast_list, - .ndo_do_ioctl = ibmveth_ioctl, + .ndo_eth_ioctl = ibmveth_ioctl, .ndo_change_mtu = ibmveth_change_mtu, .ndo_fix_features = ibmveth_fix_features, .ndo_set_features = ibmveth_set_features,
drivers/net/ethernet/intel/e100.c +1 -1
@@ -2809,7 +2809,7 @@ static const struct net_device_ops e100_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = e100_set_multicast_list, .ndo_set_mac_address = e100_set_mac_address, - .ndo_do_ioctl = e100_do_ioctl, + .ndo_eth_ioctl = e100_do_ioctl, .ndo_tx_timeout = e100_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = e100_netpoll,
drivers/net/ethernet/intel/e1000/e1000_main.c +1 -1
@@ -832,7 +832,7 @@ static const struct net_device_ops e1000_netdev_ops = { .ndo_set_mac_address = e1000_set_mac, .ndo_tx_timeout = e1000_tx_timeout, .ndo_change_mtu = e1000_change_mtu, - .ndo_do_ioctl = e1000_ioctl, + .ndo_eth_ioctl = e1000_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_vlan_rx_add_vid = e1000_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = e1000_vlan_rx_kill_vid,
drivers/net/ethernet/intel/e1000e/netdev.c +1 -1
@@ -7354,7 +7354,7 @@ static const struct net_device_ops e1000e_netdev_ops = { .ndo_set_rx_mode = e1000e_set_rx_mode, .ndo_set_mac_address = e1000_set_mac, .ndo_change_mtu = e1000_change_mtu, - .ndo_do_ioctl = e1000_ioctl, + .ndo_eth_ioctl = e1000_ioctl, .ndo_tx_timeout = e1000_tx_timeout, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -13256,7 +13256,7 @@ static const struct net_device_ops i40e_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = i40e_set_mac, .ndo_change_mtu = i40e_change_mtu, - .ndo_do_ioctl = i40e_ioctl, + .ndo_eth_ioctl = i40e_ioctl, .ndo_tx_timeout = i40e_tx_timeout, .ndo_vlan_rx_add_vid = i40e_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = i40e_vlan_rx_kill_vid,
drivers/net/ethernet/intel/ice/ice_main.c +3 -3
@@ -6558,12 +6558,12 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu) }/** -* ice_do_ioctl - Access the hwtstamp interface +* ice_eth_ioctl - Access the hwtstamp interface * @netdev: network interface device structure * @ifr: interface request data * @cmd: ioctl command */ -static int ice_do_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd) +static int ice_eth_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd) {struct ice_netdev_priv *np =netdev_priv (netdev);struct ice_pf *pf = np->vsi->back;
@@ -7229,7 +7229,7 @@ static const struct net_device_ops ice_netdev_ops = { .ndo_change_mtu = ice_change_mtu, .ndo_get_stats64 = ice_get_stats64, .ndo_set_tx_maxrate = ice_set_tx_maxrate, - .ndo_do_ioctl = ice_do_ioctl, + .ndo_eth_ioctl = ice_eth_ioctl, .ndo_set_vf_spoofchk = ice_set_vf_spoofchk, .ndo_set_vf_mac = ice_set_vf_mac, .ndo_get_vf_config = ice_get_vf_cfg,
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -2991,7 +2991,7 @@ static const struct net_device_ops igb_netdev_ops = { .ndo_set_rx_mode = igb_set_rx_mode, .ndo_set_mac_address = igb_set_mac, .ndo_change_mtu = igb_change_mtu, - .ndo_do_ioctl = igb_ioctl, + .ndo_eth_ioctl = igb_ioctl, .ndo_tx_timeout = igb_tx_timeout, .ndo_validate_addr = eth_validate_addr, .ndo_vlan_rx_add_vid = igb_vlan_rx_add_vid,
drivers/net/ethernet/intel/igbvf/netdev.c +1 -1
@@ -2657,7 +2657,7 @@ static const struct net_device_ops igbvf_netdev_ops = { .ndo_set_rx_mode = igbvf_set_rx_mode, .ndo_set_mac_address = igbvf_set_mac, .ndo_change_mtu = igbvf_change_mtu, - .ndo_do_ioctl = igbvf_ioctl, + .ndo_eth_ioctl = igbvf_ioctl, .ndo_tx_timeout = igbvf_tx_timeout, .ndo_vlan_rx_add_vid = igbvf_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = igbvf_vlan_rx_kill_vid,
drivers/net/ethernet/intel/igc/igc_main.c +1 -1
@@ -6013,7 +6013,7 @@ static const struct net_device_ops igc_netdev_ops = { .ndo_fix_features = igc_fix_features, .ndo_set_features = igc_set_features, .ndo_features_check = igc_features_check, - .ndo_do_ioctl = igc_ioctl, + .ndo_eth_ioctl = igc_ioctl, .ndo_setup_tc = igc_setup_tc, .ndo_bpf = igc_bpf, .ndo_xdp_xmit = igc_xdp_xmit,
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
@@ -10247,7 +10247,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_set_tx_maxrate = ixgbe_tx_maxrate, .ndo_vlan_rx_add_vid = ixgbe_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = ixgbe_vlan_rx_kill_vid, - .ndo_do_ioctl = ixgbe_ioctl, + .ndo_eth_ioctl = ixgbe_ioctl, .ndo_set_vf_mac = ixgbe_ndo_set_vf_mac, .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, .ndo_set_vf_rate = ixgbe_ndo_set_vf_bw,
drivers/net/ethernet/jme.c +1 -1
@@ -2901,7 +2901,7 @@ static const struct net_device_ops jme_netdev_ops = { .ndo_open = jme_open, .ndo_stop = jme_close, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = jme_ioctl, + .ndo_eth_ioctl = jme_ioctl, .ndo_start_xmit = jme_start_xmit, .ndo_set_mac_address = jme_set_macaddr, .ndo_set_rx_mode = jme_set_multi,
drivers/net/ethernet/korina.c +1 -1
@@ -1272,7 +1272,7 @@ static const struct net_device_ops korina_netdev_ops = { .ndo_start_xmit = korina_send_packet, .ndo_set_rx_mode = korina_multicast_list, .ndo_tx_timeout = korina_tx_timeout, - .ndo_do_ioctl = korina_ioctl, + .ndo_eth_ioctl = korina_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/lantiq_etop.c +1 -1
@@ -609,7 +609,7 @@ static const struct net_device_ops ltq_eth_netdev_ops = { .ndo_stop = ltq_etop_stop, .ndo_start_xmit = ltq_etop_tx, .ndo_change_mtu = ltq_etop_change_mtu, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_set_mac_address = ltq_etop_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = ltq_etop_set_multicast_list,
drivers/net/ethernet/marvell/mv643xx_eth.c +1 -1
@@ -3060,7 +3060,7 @@ static const struct net_device_ops mv643xx_eth_netdev_ops = { .ndo_set_rx_mode = mv643xx_eth_set_rx_mode, .ndo_set_mac_address = mv643xx_eth_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = mv643xx_eth_ioctl, + .ndo_eth_ioctl = mv643xx_eth_ioctl, .ndo_change_mtu = mv643xx_eth_change_mtu, .ndo_set_features = mv643xx_eth_set_features, .ndo_tx_timeout = mv643xx_eth_tx_timeout,
drivers/net/ethernet/marvell/mvneta.c +1 -1
@@ -4994,7 +4994,7 @@ static const struct net_device_ops mvneta_netdev_ops = { .ndo_change_mtu = mvneta_change_mtu, .ndo_fix_features = mvneta_fix_features, .ndo_get_stats64 = mvneta_get_stats64, - .ndo_do_ioctl = mvneta_ioctl, + .ndo_eth_ioctl = mvneta_ioctl, .ndo_bpf = mvneta_xdp, .ndo_xdp_xmit = mvneta_xdp_xmit, .ndo_setup_tc = mvneta_setup_tc,
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -5702,7 +5702,7 @@ static const struct net_device_ops mvpp2_netdev_ops = { .ndo_set_mac_address = mvpp2_set_mac_address, .ndo_change_mtu = mvpp2_change_mtu, .ndo_get_stats64 = mvpp2_get_stats64, - .ndo_do_ioctl = mvpp2_ioctl, + .ndo_eth_ioctl = mvpp2_ioctl, .ndo_vlan_rx_add_vid = mvpp2_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = mvpp2_vlan_rx_kill_vid, .ndo_set_features = mvpp2_set_features,
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +1 -1
@@ -2326,7 +2326,7 @@ static const struct net_device_ops otx2_netdev_ops = { .ndo_set_features = otx2_set_features, .ndo_tx_timeout = otx2_tx_timeout, .ndo_get_stats64 = otx2_get_stats64, - .ndo_do_ioctl = otx2_ioctl, + .ndo_eth_ioctl = otx2_ioctl, .ndo_set_vf_mac = otx2_set_vf_mac, .ndo_set_vf_vlan = otx2_set_vf_vlan, .ndo_get_vf_config = otx2_get_vf_config,
drivers/net/ethernet/marvell/pxa168_eth.c +1 -1
@@ -1377,7 +1377,7 @@ static const struct net_device_ops pxa168_eth_netdev_ops = { .ndo_set_rx_mode = pxa168_eth_set_rx_mode, .ndo_set_mac_address = pxa168_eth_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_change_mtu = pxa168_eth_change_mtu, .ndo_tx_timeout = pxa168_eth_tx_timeout,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -3787,7 +3787,7 @@ static const struct net_device_ops skge_netdev_ops = { .ndo_open = skge_up, .ndo_stop = skge_down, .ndo_start_xmit = skge_xmit_frame, - .ndo_do_ioctl = skge_ioctl, + .ndo_eth_ioctl = skge_ioctl, .ndo_get_stats = skge_get_stats, .ndo_tx_timeout = skge_tx_timeout, .ndo_change_mtu = skge_change_mtu,
drivers/net/ethernet/marvell/sky2.c +2 -2
@@ -4693,7 +4693,7 @@ static const struct net_device_ops sky2_netdev_ops[2] = { .ndo_open = sky2_open, .ndo_stop = sky2_close, .ndo_start_xmit = sky2_xmit_frame, - .ndo_do_ioctl = sky2_ioctl, + .ndo_eth_ioctl = sky2_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = sky2_set_mac_address, .ndo_set_rx_mode = sky2_set_multicast,
@@ -4710,7 +4710,7 @@ static const struct net_device_ops sky2_netdev_ops[2] = { .ndo_open = sky2_open, .ndo_stop = sky2_close, .ndo_start_xmit = sky2_xmit_frame, - .ndo_do_ioctl = sky2_ioctl, + .ndo_eth_ioctl = sky2_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = sky2_set_mac_address, .ndo_set_rx_mode = sky2_set_multicast,
drivers/net/ethernet/mediatek/mtk_eth_soc.c +1 -1
@@ -2933,7 +2933,7 @@ static const struct net_device_ops mtk_netdev_ops = { .ndo_start_xmit = mtk_start_xmit, .ndo_set_mac_address = mtk_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = mtk_do_ioctl, + .ndo_eth_ioctl = mtk_do_ioctl, .ndo_change_mtu = mtk_change_mtu, .ndo_tx_timeout = mtk_tx_timeout, .ndo_get_stats64 = mtk_get_stats64,
drivers/net/ethernet/mediatek/mtk_star_emac.c +1 -1
@@ -1162,7 +1162,7 @@ static const struct net_device_ops mtk_star_netdev_ops = { .ndo_start_xmit = mtk_star_netdev_start_xmit, .ndo_get_stats64 = mtk_star_netdev_get_stats64, .ndo_set_rx_mode = mtk_star_set_rx_mode, - .ndo_do_ioctl = mtk_star_netdev_ioctl, + .ndo_eth_ioctl = mtk_star_netdev_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -2828,7 +2828,7 @@ static const struct net_device_ops mlx4_netdev_ops = { .ndo_set_mac_address = mlx4_en_set_mac, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = mlx4_en_change_mtu, - .ndo_do_ioctl = mlx4_en_ioctl, + .ndo_eth_ioctl = mlx4_en_ioctl, .ndo_tx_timeout = mlx4_en_tx_timeout, .ndo_vlan_rx_add_vid = mlx4_en_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = mlx4_en_vlan_rx_kill_vid,
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -4417,7 +4417,7 @@ const struct net_device_ops mlx5e_netdev_ops = { .ndo_set_features = mlx5e_set_features, .ndo_fix_features = mlx5e_fix_features, .ndo_change_mtu = mlx5e_change_nic_mtu, - .ndo_do_ioctl = mlx5e_ioctl, + .ndo_eth_ioctl = mlx5e_ioctl, .ndo_set_tx_maxrate = mlx5e_set_tx_maxrate, .ndo_features_check = mlx5e_features_check, .ndo_tx_timeout = mlx5e_tx_timeout,
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c +1 -1
@@ -50,7 +50,7 @@ static const struct net_device_ops mlx5i_netdev_ops = { .ndo_init = mlx5i_dev_init, .ndo_uninit = mlx5i_dev_cleanup, .ndo_change_mtu = mlx5i_change_mtu, - .ndo_do_ioctl = mlx5i_ioctl, + .ndo_eth_ioctl = mlx5i_ioctl, };/* IPoIB mlx5 netdev profile */
drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c +1 -1
@@ -149,7 +149,7 @@ static const struct net_device_ops mlx5i_pkey_netdev_ops = { .ndo_get_stats64 = mlx5i_get_stats, .ndo_uninit = mlx5i_pkey_dev_cleanup, .ndo_change_mtu = mlx5i_pkey_change_mtu, - .ndo_do_ioctl = mlx5i_pkey_ioctl, + .ndo_eth_ioctl = mlx5i_pkey_ioctl, };/* Child NDOs */
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +2 -2
@@ -199,7 +199,7 @@ static int mlxbf_gige_stop(struct net_device *netdev)return 0 ; } -static int mlxbf_gige_do_ioctl (struct net_device *netdev, +static int mlxbf_gige_eth_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd) {if (!(netif_running (netdev)))
@@ -253,7 +253,7 @@ static const struct net_device_ops mlxbf_gige_netdev_ops = { .ndo_start_xmit = mlxbf_gige_start_xmit, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = mlxbf_gige_do_ioctl, + .ndo_eth_ioctl = mlxbf_gige_eth_ioctl, .ndo_set_rx_mode = mlxbf_gige_set_rx_mode, .ndo_get_stats64 = mlxbf_gige_get_stats64, };
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +1 -1
@@ -1207,7 +1207,7 @@ static const struct net_device_ops mlxsw_sp_port_netdev_ops = { .ndo_vlan_rx_kill_vid = mlxsw_sp_port_kill_vid, .ndo_set_features = mlxsw_sp_set_features, .ndo_get_devlink_port = mlxsw_sp_port_get_devlink_port, - .ndo_do_ioctl = mlxsw_sp_port_ioctl, + .ndo_eth_ioctl = mlxsw_sp_port_ioctl, }; static int
drivers/net/ethernet/micrel/ks8851_common.c +1 -1
@@ -689,7 +689,7 @@ static int ks8851_net_ioctl(struct net_device *dev, struct ifreq *req, int cmd)static const struct net_device_ops ks8851_netdev_ops = { .ndo_open = ks8851_net_open, .ndo_stop = ks8851_net_stop, - .ndo_do_ioctl = ks8851_net_ioctl, + .ndo_eth_ioctl = ks8851_net_ioctl, .ndo_start_xmit = ks8851_start_xmit, .ndo_set_mac_address = ks8851_set_mac_address, .ndo_set_rx_mode = ks8851_set_rx_mode,
drivers/net/ethernet/micrel/ksz884x.c +1 -1
@@ -6738,7 +6738,7 @@ static const struct net_device_ops netdev_ops = { .ndo_set_features = netdev_set_features, .ndo_set_mac_address = netdev_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_set_rx_mode = netdev_set_rx_mode, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = netdev_netpoll,
drivers/net/ethernet/microchip/lan743x_main.c +1 -1
@@ -2655,7 +2655,7 @@ static const struct net_device_ops lan743x_netdev_ops = { .ndo_open = lan743x_netdev_open, .ndo_stop = lan743x_netdev_close, .ndo_start_xmit = lan743x_netdev_xmit_frame, - .ndo_do_ioctl = lan743x_netdev_ioctl, + .ndo_eth_ioctl = lan743x_netdev_ioctl, .ndo_set_rx_mode = lan743x_netdev_set_multicast, .ndo_change_mtu = lan743x_netdev_change_mtu, .ndo_get_stats64 = lan743x_netdev_get_stats64,
drivers/net/ethernet/mscc/ocelot_net.c +1 -1
@@ -823,7 +823,7 @@ static const struct net_device_ops ocelot_port_netdev_ops = { .ndo_vlan_rx_kill_vid = ocelot_vlan_rx_kill_vid, .ndo_set_features = ocelot_set_features, .ndo_setup_tc = ocelot_setup_tc, - .ndo_do_ioctl = ocelot_ioctl, + .ndo_eth_ioctl = ocelot_ioctl, .ndo_get_devlink_port = ocelot_get_devlink_port, };
drivers/net/ethernet/natsemi/natsemi.c +1 -1
@@ -790,7 +790,7 @@ static const struct net_device_ops natsemi_netdev_ops = { .ndo_get_stats = get_stats, .ndo_set_rx_mode = set_rx_mode, .ndo_change_mtu = natsemi_change_mtu, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_tx_timeout = ns_tx_timeout, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/neterion/s2io.c +1 -1
@@ -7625,7 +7625,7 @@ static const struct net_device_ops s2io_netdev_ops = { .ndo_start_xmit = s2io_xmit, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = s2io_ndo_set_multicast, - .ndo_do_ioctl = s2io_ioctl, + .ndo_eth_ioctl = s2io_ioctl, .ndo_set_mac_address = s2io_set_mac_addr, .ndo_change_mtu = s2io_change_mtu, .ndo_set_features = s2io_set_features,
drivers/net/ethernet/neterion/vxge/vxge-main.c +1 -1
@@ -3339,7 +3339,7 @@ static const struct net_device_ops vxge_netdev_ops = { .ndo_start_xmit = vxge_xmit, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = vxge_set_multicast, - .ndo_do_ioctl = vxge_ioctl, + .ndo_eth_ioctl = vxge_ioctl, .ndo_set_mac_address = vxge_set_mac_addr, .ndo_change_mtu = vxge_change_mtu, .ndo_fix_features = vxge_fix_features,
drivers/net/ethernet/nxp/lpc_eth.c +1 -1
@@ -1219,7 +1219,7 @@ static const struct net_device_ops lpc_netdev_ops = { .ndo_stop = lpc_eth_close, .ndo_start_xmit = lpc_eth_hard_start_xmit, .ndo_set_rx_mode = lpc_eth_set_multicast_list, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_mac_address = lpc_set_mac_address, .ndo_validate_addr = eth_validate_addr, };
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +1 -1
@@ -2333,7 +2333,7 @@ static const struct net_device_ops pch_gbe_netdev_ops = { .ndo_tx_timeout = pch_gbe_tx_timeout, .ndo_change_mtu = pch_gbe_change_mtu, .ndo_set_features = pch_gbe_set_features, - .ndo_do_ioctl = pch_gbe_ioctl, + .ndo_eth_ioctl = pch_gbe_ioctl, .ndo_set_rx_mode = pch_gbe_set_multi, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = pch_gbe_netpoll,
drivers/net/ethernet/packetengines/hamachi.c +1 -1
@@ -573,7 +573,7 @@ static const struct net_device_ops hamachi_netdev_ops = { .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, .ndo_tx_timeout = hamachi_tx_timeout, - .ndo_do_ioctl = hamachi_ioctl, + .ndo_eth_ioctl = hamachi_ioctl, .ndo_siocdevprivate = hamachi_siocdevprivate, };
drivers/net/ethernet/packetengines/yellowfin.c +1 -1
@@ -362,7 +362,7 @@ static const struct net_device_ops netdev_ops = { .ndo_set_rx_mode = set_rx_mode, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_tx_timeout = yellowfin_tx_timeout, };
drivers/net/ethernet/pensando/ionic/ionic_lif.c +2 -2
@@ -2264,7 +2264,7 @@ static int ionic_stop(struct net_device *netdev)return 0 ; } -static int ionic_do_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd) +static int ionic_eth_ioctl (struct net_device *netdev,struct ifreq *ifr,int cmd) {struct ionic_lif *lif =netdev_priv (netdev);
@@ -2526,7 +2526,7 @@ static int ionic_set_vf_link_state(struct net_device *netdev, int vf, int set)static const struct net_device_ops ionic_netdev_ops = { .ndo_open = ionic_open, .ndo_stop = ionic_stop, - .ndo_do_ioctl = ionic_do_ioctl, + .ndo_eth_ioctl = ionic_eth_ioctl, .ndo_start_xmit = ionic_start_xmit, .ndo_get_stats64 = ionic_get_stats64, .ndo_set_rx_mode = ionic_ndo_set_rx_mode,
drivers/net/ethernet/qlogic/qede/qede_main.c +1 -1
@@ -644,7 +644,7 @@ static const struct net_device_ops qede_netdev_ops = { .ndo_set_mac_address = qede_set_mac_addr, .ndo_validate_addr = eth_validate_addr, .ndo_change_mtu = qede_change_mtu, - .ndo_do_ioctl = qede_ioctl, + .ndo_eth_ioctl = qede_ioctl, .ndo_tx_timeout = qede_tx_timeout, #ifdef CONFIG_QED_SRIOV .ndo_set_vf_mac = qede_set_vf_mac,
drivers/net/ethernet/qualcomm/emac/emac.c +1 -1
@@ -377,7 +377,7 @@ static const struct net_device_ops emac_netdev_ops = { .ndo_start_xmit = emac_start_xmit, .ndo_set_mac_address = eth_mac_addr, .ndo_change_mtu = emac_change_mtu, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_tx_timeout = emac_tx_timeout, .ndo_get_stats64 = emac_get_stats64, .ndo_set_features = emac_set_features,
drivers/net/ethernet/rdc/r6040.c +1 -1
@@ -954,7 +954,7 @@ static const struct net_device_ops r6040_netdev_ops = { .ndo_set_rx_mode = r6040_multicast_list, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_tx_timeout = r6040_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = r6040_poll_controller,
drivers/net/ethernet/realtek/8139cp.c +1 -1
@@ -1869,7 +1869,7 @@ static const struct net_device_ops cp_netdev_ops = { .ndo_set_mac_address = cp_set_mac_address, .ndo_set_rx_mode = cp_set_rx_mode, .ndo_get_stats = cp_get_stats, - .ndo_do_ioctl = cp_ioctl, + .ndo_eth_ioctl = cp_ioctl, .ndo_start_xmit = cp_start_xmit, .ndo_tx_timeout = cp_tx_timeout, .ndo_set_features = cp_set_features,
drivers/net/ethernet/realtek/8139too.c +1 -1
@@ -932,7 +932,7 @@ static const struct net_device_ops rtl8139_netdev_ops = { .ndo_set_mac_address = rtl8139_set_mac_address, .ndo_start_xmit = rtl8139_start_xmit, .ndo_set_rx_mode = rtl8139_set_rx_mode, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_tx_timeout = rtl8139_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = rtl8139_poll_controller,
drivers/net/ethernet/realtek/r8169_main.c +1 -1
@@ -4979,7 +4979,7 @@ static const struct net_device_ops rtl_netdev_ops = { .ndo_fix_features = rtl8169_fix_features, .ndo_set_features = rtl8169_set_features, .ndo_set_mac_address = rtl_set_mac_address, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_rx_mode = rtl_set_rx_mode, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = rtl8169_netpoll,
drivers/net/ethernet/renesas/ravb_main.c +1 -1
@@ -1872,7 +1872,7 @@ static const struct net_device_ops ravb_netdev_ops = { .ndo_get_stats = ravb_get_stats, .ndo_set_rx_mode = ravb_set_rx_mode, .ndo_tx_timeout = ravb_tx_timeout, - .ndo_do_ioctl = ravb_do_ioctl, + .ndo_eth_ioctl = ravb_do_ioctl, .ndo_change_mtu = ravb_change_mtu, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/renesas/sh_eth.c +2 -2
@@ -3141,7 +3141,7 @@ static const struct net_device_ops sh_eth_netdev_ops = { .ndo_get_stats = sh_eth_get_stats, .ndo_set_rx_mode = sh_eth_set_rx_mode, .ndo_tx_timeout = sh_eth_tx_timeout, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_change_mtu = sh_eth_change_mtu, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,
@@ -3157,7 +3157,7 @@ static const struct net_device_ops sh_eth_netdev_ops_tsu = { .ndo_vlan_rx_add_vid = sh_eth_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = sh_eth_vlan_rx_kill_vid, .ndo_tx_timeout = sh_eth_tx_timeout, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_change_mtu = sh_eth_change_mtu, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +1 -1
@@ -1964,7 +1964,7 @@ static const struct net_device_ops sxgbe_netdev_ops = { .ndo_set_features = sxgbe_set_features, .ndo_set_rx_mode = sxgbe_set_rx_mode, .ndo_tx_timeout = sxgbe_tx_timeout, - .ndo_do_ioctl = sxgbe_ioctl, + .ndo_eth_ioctl = sxgbe_ioctl,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = sxgbe_poll_controller,#endif
drivers/net/ethernet/sfc/efx.c +1 -1
@@ -591,7 +591,7 @@ static const struct net_device_ops efx_netdev_ops = { .ndo_tx_timeout = efx_watchdog, .ndo_start_xmit = efx_hard_start_xmit, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = efx_ioctl, + .ndo_eth_ioctl = efx_ioctl, .ndo_change_mtu = efx_change_mtu, .ndo_set_mac_address = efx_set_mac_address, .ndo_set_rx_mode = efx_set_rx_mode,
drivers/net/ethernet/sfc/falcon/efx.c +1 -1
@@ -2219,7 +2219,7 @@ static const struct net_device_ops ef4_netdev_ops = { .ndo_tx_timeout = ef4_watchdog, .ndo_start_xmit = ef4_hard_start_xmit, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = ef4_ioctl, + .ndo_eth_ioctl = ef4_ioctl, .ndo_change_mtu = ef4_change_mtu, .ndo_set_mac_address = ef4_set_mac_address, .ndo_set_rx_mode = ef4_set_rx_mode,
drivers/net/ethernet/sgi/ioc3-eth.c +1 -1
@@ -820,7 +820,7 @@ static const struct net_device_ops ioc3_netdev_ops = { .ndo_tx_timeout = ioc3_timeout, .ndo_get_stats = ioc3_get_stats, .ndo_set_rx_mode = ioc3_set_multicast_list, - .ndo_do_ioctl = ioc3_ioctl, + .ndo_eth_ioctl = ioc3_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = ioc3_set_mac_address, };
drivers/net/ethernet/sgi/meth.c +1 -1
@@ -812,7 +812,7 @@ static const struct net_device_ops meth_netdev_ops = { .ndo_open = meth_open, .ndo_stop = meth_release, .ndo_start_xmit = meth_tx, - .ndo_do_ioctl = meth_ioctl, + .ndo_eth_ioctl = meth_ioctl, .ndo_tx_timeout = meth_tx_timeout, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/sis/sis190.c +1 -1
@@ -1841,7 +1841,7 @@ static int sis190_mac_addr(struct net_device *dev, void *p)static const struct net_device_ops sis190_netdev_ops = { .ndo_open = sis190_open, .ndo_stop = sis190_close, - .ndo_do_ioctl = sis190_ioctl, + .ndo_eth_ioctl = sis190_ioctl, .ndo_start_xmit = sis190_start_xmit, .ndo_tx_timeout = sis190_tx_timeout, .ndo_set_rx_mode = sis190_set_rx_mode,
drivers/net/ethernet/sis/sis900.c +1 -1
@@ -404,7 +404,7 @@ static const struct net_device_ops sis900_netdev_ops = { .ndo_set_rx_mode = set_rx_mode, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, - .ndo_do_ioctl = mii_ioctl, + .ndo_eth_ioctl = mii_ioctl, .ndo_tx_timeout = sis900_tx_timeout, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = sis900_poll,
drivers/net/ethernet/smsc/epic100.c +1 -1
@@ -312,7 +312,7 @@ static const struct net_device_ops epic_netdev_ops = { .ndo_tx_timeout = epic_tx_timeout, .ndo_get_stats = epic_get_stats, .ndo_set_rx_mode = set_rx_mode, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
drivers/net/ethernet/smsc/smc91c92_cs.c +1 -1
@@ -294,7 +294,7 @@ static const struct net_device_ops smc_netdev_ops = { .ndo_tx_timeout = smc_tx_timeout, .ndo_set_config = s9k_config, .ndo_set_rx_mode = set_rx_mode, - .ndo_do_ioctl = smc_ioctl, + .ndo_eth_ioctl = smc_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
drivers/net/ethernet/smsc/smsc911x.c +1 -1
@@ -2148,7 +2148,7 @@ static const struct net_device_ops smsc911x_netdev_ops = { .ndo_start_xmit = smsc911x_hard_start_xmit, .ndo_get_stats = smsc911x_get_stats, .ndo_set_rx_mode = smsc911x_set_multicast_list, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = smsc911x_set_mac_address, #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/smsc/smsc9420.c +1 -1
@@ -1482,7 +1482,7 @@ static const struct net_device_ops smsc9420_netdev_ops = { .ndo_start_xmit = smsc9420_hard_start_xmit, .ndo_get_stats = smsc9420_get_stats, .ndo_set_rx_mode = smsc9420_set_multicast_list, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/socionext/netsec.c +1 -1
@@ -1831,7 +1831,7 @@ static const struct net_device_ops netsec_netdev_ops = { .ndo_set_features = netsec_netdev_set_features, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl, + .ndo_eth_ioctl = phy_do_ioctl, .ndo_xdp_xmit = netsec_xdp_xmit, .ndo_bpf = netsec_xdp, };
drivers/net/ethernet/socionext/sni_ave.c +1 -1
@@ -1543,7 +1543,7 @@ static const struct net_device_ops ave_netdev_ops = { .ndo_open = ave_open, .ndo_stop = ave_stop, .ndo_start_xmit = ave_start_xmit, - .ndo_do_ioctl = ave_ioctl, + .ndo_eth_ioctl = ave_ioctl, .ndo_set_rx_mode = ave_set_rx_mode, .ndo_get_stats64 = ave_get_stats64, .ndo_set_mac_address = ave_set_mac_address,
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -6451,7 +6451,7 @@ static const struct net_device_ops stmmac_netdev_ops = { .ndo_set_features = stmmac_set_features, .ndo_set_rx_mode = stmmac_set_rx_mode, .ndo_tx_timeout = stmmac_tx_timeout, - .ndo_do_ioctl = stmmac_ioctl, + .ndo_eth_ioctl = stmmac_ioctl, .ndo_setup_tc = stmmac_setup_tc, .ndo_select_queue = stmmac_select_queue,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/sun/cassini.c +1 -1
@@ -4876,7 +4876,7 @@ static const struct net_device_ops cas_netdev_ops = { .ndo_start_xmit = cas_start_xmit, .ndo_get_stats = cas_get_stats, .ndo_set_rx_mode = cas_set_multicast, - .ndo_do_ioctl = cas_ioctl, + .ndo_eth_ioctl = cas_ioctl, .ndo_tx_timeout = cas_tx_timeout, .ndo_change_mtu = cas_change_mtu, .ndo_set_mac_address = eth_mac_addr,
drivers/net/ethernet/sun/niu.c +1 -1
@@ -9667,7 +9667,7 @@ static const struct net_device_ops niu_netdev_ops = { .ndo_set_rx_mode = niu_set_rx_mode, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = niu_set_mac_addr, - .ndo_do_ioctl = niu_ioctl, + .ndo_eth_ioctl = niu_ioctl, .ndo_tx_timeout = niu_tx_timeout, .ndo_change_mtu = niu_change_mtu, };
drivers/net/ethernet/sun/sungem.c +1 -1
@@ -2831,7 +2831,7 @@ static const struct net_device_ops gem_netdev_ops = { .ndo_start_xmit = gem_start_xmit, .ndo_get_stats = gem_get_stats, .ndo_set_rx_mode = gem_set_multicast, - .ndo_do_ioctl = gem_ioctl, + .ndo_eth_ioctl = gem_ioctl, .ndo_tx_timeout = gem_tx_timeout, .ndo_change_mtu = gem_change_mtu, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +1 -1
@@ -933,7 +933,7 @@ static const struct net_device_ops xlgmac_netdev_ops = { .ndo_change_mtu = xlgmac_change_mtu, .ndo_set_mac_address = xlgmac_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = xlgmac_ioctl, + .ndo_eth_ioctl = xlgmac_ioctl, .ndo_vlan_rx_add_vid = xlgmac_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = xlgmac_vlan_rx_kill_vid, #ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/ti/am65-cpsw-nuss.c +1 -1
@@ -1480,7 +1480,7 @@ static const struct net_device_ops am65_cpsw_nuss_netdev_ops = { .ndo_tx_timeout = am65_cpsw_nuss_ndo_host_tx_timeout, .ndo_vlan_rx_add_vid = am65_cpsw_nuss_ndo_slave_add_vid, .ndo_vlan_rx_kill_vid = am65_cpsw_nuss_ndo_slave_kill_vid, - .ndo_do_ioctl = am65_cpsw_nuss_ndo_slave_ioctl, + .ndo_eth_ioctl = am65_cpsw_nuss_ndo_slave_ioctl, .ndo_setup_tc = am65_cpsw_qos_ndo_setup_tc, .ndo_get_devlink_port = am65_cpsw_ndo_get_devlink_port, };
drivers/net/ethernet/ti/cpmac.c +1 -1
@@ -1044,7 +1044,7 @@ static const struct net_device_ops cpmac_netdev_ops = { .ndo_start_xmit = cpmac_start_xmit, .ndo_tx_timeout = cpmac_tx_timeout, .ndo_set_rx_mode = cpmac_set_multicast_list, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, };
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -1159,7 +1159,7 @@ static const struct net_device_ops cpsw_netdev_ops = { .ndo_stop = cpsw_ndo_stop, .ndo_start_xmit = cpsw_ndo_start_xmit, .ndo_set_mac_address = cpsw_ndo_set_mac_address, - .ndo_do_ioctl = cpsw_ndo_ioctl, + .ndo_eth_ioctl = cpsw_ndo_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_tx_timeout = cpsw_ndo_tx_timeout, .ndo_set_rx_mode = cpsw_ndo_set_rx_mode,
drivers/net/ethernet/ti/cpsw_new.c +1 -1
@@ -1128,7 +1128,7 @@ static const struct net_device_ops cpsw_netdev_ops = { .ndo_stop = cpsw_ndo_stop, .ndo_start_xmit = cpsw_ndo_start_xmit, .ndo_set_mac_address = cpsw_ndo_set_mac_address, - .ndo_do_ioctl = cpsw_ndo_ioctl, + .ndo_eth_ioctl = cpsw_ndo_ioctl, .ndo_validate_addr = eth_validate_addr, .ndo_tx_timeout = cpsw_ndo_tx_timeout, .ndo_set_rx_mode = cpsw_ndo_set_rx_mode,
drivers/net/ethernet/ti/davinci_emac.c +1 -1
@@ -1670,7 +1670,7 @@ static const struct net_device_ops emac_netdev_ops = { .ndo_start_xmit = emac_dev_xmit, .ndo_set_rx_mode = emac_dev_mcast_set, .ndo_set_mac_address = emac_dev_setmac_addr, - .ndo_do_ioctl = emac_devioctl, + .ndo_eth_ioctl = emac_devioctl, .ndo_tx_timeout = emac_dev_tx_timeout, .ndo_get_stats = emac_dev_getnetstats,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/ti/netcp_core.c +1 -1
@@ -1944,7 +1944,7 @@ static const struct net_device_ops netcp_netdev_ops = { .ndo_stop = netcp_ndo_stop, .ndo_start_xmit = netcp_ndo_start_xmit, .ndo_set_rx_mode = netcp_set_rx_mode, - .ndo_do_ioctl = netcp_ndo_ioctl, + .ndo_eth_ioctl = netcp_ndo_ioctl, .ndo_get_stats64 = netcp_get_stats, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/ti/tlan.c +1 -1
@@ -749,7 +749,7 @@ static const struct net_device_ops tlan_netdev_ops = { .ndo_tx_timeout = tlan_tx_timeout, .ndo_get_stats = tlan_get_stats, .ndo_set_rx_mode = tlan_set_multicast_list, - .ndo_do_ioctl = tlan_ioctl, + .ndo_eth_ioctl = tlan_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/toshiba/spider_net.c +1 -1
@@ -2214,7 +2214,7 @@ static const struct net_device_ops spider_net_ops = { .ndo_start_xmit = spider_net_xmit, .ndo_set_rx_mode = spider_net_set_multi, .ndo_set_mac_address = spider_net_set_mac, - .ndo_do_ioctl = spider_net_do_ioctl, + .ndo_eth_ioctl = spider_net_do_ioctl, .ndo_tx_timeout = spider_net_tx_timeout, .ndo_validate_addr = eth_validate_addr,/* HW VLAN */
drivers/net/ethernet/toshiba/tc35815.c +1 -1
@@ -750,7 +750,7 @@ static const struct net_device_ops tc35815_netdev_ops = { .ndo_get_stats = tc35815_get_stats, .ndo_set_rx_mode = tc35815_set_multicast_list, .ndo_tx_timeout = tc35815_tx_timeout, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/tundra/tsi108_eth.c +1 -1
@@ -1538,7 +1538,7 @@ static const struct net_device_ops tsi108_netdev_ops = { .ndo_start_xmit = tsi108_send_packet, .ndo_set_rx_mode = tsi108_set_rx_mode, .ndo_get_stats = tsi108_get_stats, - .ndo_do_ioctl = tsi108_do_ioctl, + .ndo_eth_ioctl = tsi108_do_ioctl, .ndo_set_mac_address = tsi108_set_mac, .ndo_validate_addr = eth_validate_addr, };
drivers/net/ethernet/via/via-rhine.c +1 -1
@@ -884,7 +884,7 @@ static const struct net_device_ops rhine_netdev_ops = { .ndo_set_rx_mode = rhine_set_rx_mode, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = eth_mac_addr, - .ndo_do_ioctl = netdev_ioctl, + .ndo_eth_ioctl = netdev_ioctl, .ndo_tx_timeout = rhine_tx_timeout, .ndo_vlan_rx_add_vid = rhine_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = rhine_vlan_rx_kill_vid,
drivers/net/ethernet/via/via-velocity.c +1 -1
@@ -2637,7 +2637,7 @@ static const struct net_device_ops velocity_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, .ndo_set_rx_mode = velocity_set_multi, .ndo_change_mtu = velocity_change_mtu, - .ndo_do_ioctl = velocity_ioctl, + .ndo_eth_ioctl = velocity_ioctl, .ndo_vlan_rx_add_vid = velocity_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = velocity_vlan_rx_kill_vid,#ifdef CONFIG_NET_POLL_CONTROLLER
drivers/net/ethernet/xilinx/ll_temac_main.c +1 -1
@@ -1237,7 +1237,7 @@ static const struct net_device_ops temac_netdev_ops = { .ndo_set_rx_mode = temac_set_multicast_list, .ndo_set_mac_address = temac_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = temac_poll_controller,#endif
drivers/net/ethernet/xilinx/xilinx_axienet_main.c +1 -1
@@ -1227,7 +1227,7 @@ static const struct net_device_ops axienet_netdev_ops = { .ndo_change_mtu = axienet_change_mtu, .ndo_set_mac_address = netdev_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = axienet_ioctl, + .ndo_eth_ioctl = axienet_ioctl, .ndo_set_rx_mode = axienet_set_multicast_list, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = axienet_poll_controller,
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -1263,7 +1263,7 @@ static const struct net_device_ops xemaclite_netdev_ops = { .ndo_start_xmit = xemaclite_send, .ndo_set_mac_address = xemaclite_set_mac_address, .ndo_tx_timeout = xemaclite_tx_timeout, - .ndo_do_ioctl = xemaclite_ioctl, + .ndo_eth_ioctl = xemaclite_ioctl,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = xemaclite_poll_controller,#endif
drivers/net/ethernet/xircom/xirc2ps_cs.c +1 -1
@@ -464,7 +464,7 @@ static const struct net_device_ops netdev_ops = { .ndo_start_xmit = do_start_xmit, .ndo_tx_timeout = xirc_tx_timeout, .ndo_set_config = do_config, - .ndo_do_ioctl = do_ioctl, + .ndo_eth_ioctl = do_ioctl, .ndo_set_rx_mode = set_multicast_list, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr,
drivers/net/ethernet/xscale/ixp4xx_eth.c +1 -1
@@ -1357,7 +1357,7 @@ static const struct net_device_ops ixp4xx_netdev_ops = { .ndo_stop = eth_close, .ndo_start_xmit = eth_xmit, .ndo_set_rx_mode = eth_set_mcast_list, - .ndo_do_ioctl = eth_ioctl, + .ndo_eth_ioctl = eth_ioctl, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, };
drivers/net/macvlan.c +4 -4
@@ -829,7 +829,7 @@ static int macvlan_change_mtu(struct net_device *dev, int new_mtu)return 0 ; } -static int macvlan_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int macvlan_eth_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {struct net_device *real_dev =macvlan_dev_real_dev (dev);const struct net_device_ops *ops = real_dev->netdev_ops;
@@ -845,8 +845,8 @@ static int macvlan_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)break ; fallthrough;case SIOCGHWTSTAMP : -if (netif_device_present (real_dev) && ops->ndo_do_ioctl) - err = ops->ndo_do_ioctl (real_dev, &ifrr, cmd); +if (netif_device_present (real_dev) && ops->ndo_eth_ioctl) + err = ops->ndo_eth_ioctl (real_dev, &ifrr, cmd);break ; }
@@ -1151,7 +1151,7 @@ static const struct net_device_ops macvlan_netdev_ops = { .ndo_stop = macvlan_stop, .ndo_start_xmit = macvlan_start_xmit, .ndo_change_mtu = macvlan_change_mtu, - .ndo_do_ioctl = macvlan_do_ioctl, + .ndo_eth_ioctl = macvlan_eth_ioctl, .ndo_fix_features = macvlan_fix_features, .ndo_change_rx_flags = macvlan_change_rx_flags, .ndo_set_mac_address = macvlan_set_mac_address,
drivers/net/phy/phy.c +2 -2
@@ -426,7 +426,7 @@ int phy_mii_ioctl(struct phy_device *phydev, struct ifreq *ifr, int cmd)EXPORT_SYMBOL (phy_mii_ioctl);/** -* phy_do_ioctl - generic ndo_do_ioctl implementation +* phy_do_ioctl - generic ndo_eth_ioctl implementation * @dev: the net_device struct * @ifr: &struct ifreq for socket ioctl's * @cmd: ioctl cmd to execute
@@ -441,7 +441,7 @@ int phy_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)EXPORT_SYMBOL (phy_do_ioctl);/** -* phy_do_ioctl_running - generic ndo_do_ioctl implementation but test first +* phy_do_ioctl_running - generic ndo_eth_ioctl implementation but test first * * @dev: the net_device struct * @ifr: &struct ifreq for socket ioctl's
drivers/net/usb/asix_devices.c +3 -3
@@ -197,7 +197,7 @@ static const struct net_device_ops ax88172_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = asix_ioctl, + .ndo_eth_ioctl = asix_ioctl, .ndo_set_rx_mode = ax88172_set_multicast, };
@@ -589,7 +589,7 @@ static const struct net_device_ops ax88772_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = asix_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_rx_mode = asix_set_multicast, };
@@ -1095,7 +1095,7 @@ static const struct net_device_ops ax88178_netdev_ops = { .ndo_set_mac_address = asix_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = asix_set_multicast, - .ndo_do_ioctl = asix_ioctl, + .ndo_eth_ioctl = asix_ioctl, .ndo_change_mtu = ax88178_change_mtu, };
drivers/net/usb/ax88172a.c +1 -1
@@ -109,7 +109,7 @@ static const struct net_device_ops ax88172a_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = asix_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_rx_mode = asix_set_multicast, };
drivers/net/usb/ax88179_178a.c +1 -1
@@ -1035,7 +1035,7 @@ static const struct net_device_ops ax88179_netdev_ops = { .ndo_change_mtu = ax88179_change_mtu, .ndo_set_mac_address = ax88179_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = ax88179_ioctl, + .ndo_eth_ioctl = ax88179_ioctl, .ndo_set_rx_mode = ax88179_set_multicast, .ndo_set_features = ax88179_set_features, };
drivers/net/usb/dm9601.c +1 -1
@@ -345,7 +345,7 @@ static const struct net_device_ops dm9601_netdev_ops = { .ndo_change_mtu = usbnet_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = dm9601_ioctl, + .ndo_eth_ioctl = dm9601_ioctl, .ndo_set_rx_mode = dm9601_set_multicast, .ndo_set_mac_address = dm9601_set_mac_address, };
drivers/net/usb/lan78xx.c +1 -1
@@ -3601,7 +3601,7 @@ static const struct net_device_ops lan78xx_netdev_ops = { .ndo_change_mtu = lan78xx_change_mtu, .ndo_set_mac_address = lan78xx_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = phy_do_ioctl_running, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_rx_mode = lan78xx_set_multicast, .ndo_set_features = lan78xx_set_features, .ndo_vlan_rx_add_vid = lan78xx_vlan_rx_add_vid,
drivers/net/usb/mcs7830.c +1 -1
@@ -464,7 +464,7 @@ static const struct net_device_ops mcs7830_netdev_ops = { .ndo_change_mtu = usbnet_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = mcs7830_ioctl, + .ndo_eth_ioctl = mcs7830_ioctl, .ndo_set_rx_mode = mcs7830_set_multicast, .ndo_set_mac_address = mcs7830_set_mac_address, };
drivers/net/usb/r8152.c +1 -1
@@ -9173,7 +9173,7 @@ static int rtl8152_change_mtu(struct net_device *dev, int new_mtu)static const struct net_device_ops rtl8152_netdev_ops = { .ndo_open = rtl8152_open, .ndo_stop = rtl8152_close, - .ndo_do_ioctl = rtl8152_ioctl, + .ndo_eth_ioctl = rtl8152_ioctl, .ndo_start_xmit = rtl8152_start_xmit, .ndo_tx_timeout = rtl8152_tx_timeout, .ndo_set_features = rtl8152_set_features,
drivers/net/usb/smsc75xx.c +1 -1
@@ -1439,7 +1439,7 @@ static const struct net_device_ops smsc75xx_netdev_ops = { .ndo_change_mtu = smsc75xx_change_mtu, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = smsc75xx_ioctl, + .ndo_eth_ioctl = smsc75xx_ioctl, .ndo_set_rx_mode = smsc75xx_set_multicast, .ndo_set_features = smsc75xx_set_features, };
drivers/net/usb/smsc95xx.c +1 -1
@@ -1044,7 +1044,7 @@ static const struct net_device_ops smsc95xx_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = smsc95xx_ioctl, + .ndo_eth_ioctl = smsc95xx_ioctl, .ndo_set_rx_mode = smsc95xx_set_multicast, .ndo_set_features = smsc95xx_set_features, };
drivers/net/usb/sr9700.c +1 -1
@@ -310,7 +310,7 @@ static const struct net_device_ops sr9700_netdev_ops = { .ndo_change_mtu = usbnet_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = sr9700_ioctl, + .ndo_eth_ioctl = sr9700_ioctl, .ndo_set_rx_mode = sr9700_set_multicast, .ndo_set_mac_address = sr9700_set_mac_address, };
drivers/net/usb/sr9800.c +1 -1
@@ -684,7 +684,7 @@ static const struct net_device_ops sr9800_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = sr_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_do_ioctl = sr_ioctl, + .ndo_eth_ioctl = sr_ioctl, .ndo_set_rx_mode = sr_set_multicast, };
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -836,7 +836,7 @@ static const struct net_device_ops qeth_l2_netdev_ops = { .ndo_select_queue = qeth_l2_select_queue, .ndo_validate_addr = qeth_l2_validate_addr, .ndo_set_rx_mode = qeth_l2_set_rx_mode, - .ndo_do_ioctl = qeth_do_ioctl, + .ndo_eth_ioctl = qeth_do_ioctl, .ndo_siocdevprivate = qeth_siocdevprivate, .ndo_set_mac_address = qeth_l2_set_mac_address, .ndo_vlan_rx_add_vid = qeth_l2_vlan_rx_add_vid,
drivers/s390/net/qeth_l3_main.c +2 -2
@@ -1841,7 +1841,7 @@ static const struct net_device_ops qeth_l3_netdev_ops = { .ndo_select_queue = qeth_l3_iqd_select_queue, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = qeth_l3_set_rx_mode, - .ndo_do_ioctl = qeth_do_ioctl, + .ndo_eth_ioctl = qeth_do_ioctl, .ndo_siocdevprivate = qeth_siocdevprivate, .ndo_fix_features = qeth_fix_features, .ndo_set_features = qeth_set_features,
@@ -1857,7 +1857,7 @@ static const struct net_device_ops qeth_l3_osa_netdev_ops = { .ndo_select_queue = qeth_l3_osa_select_queue, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = qeth_l3_set_rx_mode, - .ndo_do_ioctl = qeth_do_ioctl, + .ndo_eth_ioctl = qeth_do_ioctl, .ndo_siocdevprivate = qeth_siocdevprivate, .ndo_fix_features = qeth_fix_features, .ndo_set_features = qeth_set_features,
drivers/staging/octeon/ethernet.c +6 -6
@@ -524,7 +524,7 @@ static const struct net_device_ops cvm_oct_npi_netdev_ops = { .ndo_start_xmit = cvm_oct_xmit, .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, + .ndo_eth_ioctl = cvm_oct_ioctl, .ndo_change_mtu = cvm_oct_common_change_mtu, .ndo_get_stats = cvm_oct_common_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -540,7 +540,7 @@ static const struct net_device_ops cvm_oct_xaui_netdev_ops = { .ndo_start_xmit = cvm_oct_xmit, .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, + .ndo_eth_ioctl = cvm_oct_ioctl, .ndo_change_mtu = cvm_oct_common_change_mtu, .ndo_get_stats = cvm_oct_common_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -556,7 +556,7 @@ static const struct net_device_ops cvm_oct_sgmii_netdev_ops = { .ndo_start_xmit = cvm_oct_xmit, .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, + .ndo_eth_ioctl = cvm_oct_ioctl, .ndo_change_mtu = cvm_oct_common_change_mtu, .ndo_get_stats = cvm_oct_common_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -570,7 +570,7 @@ static const struct net_device_ops cvm_oct_spi_netdev_ops = { .ndo_start_xmit = cvm_oct_xmit, .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, + .ndo_eth_ioctl = cvm_oct_ioctl, .ndo_change_mtu = cvm_oct_common_change_mtu, .ndo_get_stats = cvm_oct_common_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -586,7 +586,7 @@ static const struct net_device_ops cvm_oct_rgmii_netdev_ops = { .ndo_start_xmit = cvm_oct_xmit, .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, + .ndo_eth_ioctl = cvm_oct_ioctl, .ndo_change_mtu = cvm_oct_common_change_mtu, .ndo_get_stats = cvm_oct_common_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -599,7 +599,7 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = { .ndo_start_xmit = cvm_oct_xmit_pow, .ndo_set_rx_mode = cvm_oct_common_set_multicast_list, .ndo_set_mac_address = cvm_oct_common_set_mac_address, - .ndo_do_ioctl = cvm_oct_ioctl, + .ndo_eth_ioctl = cvm_oct_ioctl, .ndo_change_mtu = cvm_oct_common_change_mtu, .ndo_get_stats = cvm_oct_common_get_stats, #ifdef CONFIG_NET_POLL_CONTROLLER
include/linux/netdevice.h +6 -0
@@ -1090,6 +1090,10 @@ struct netdev_net_notifier {* the generic interface code. If not defined ioctls return * not supported error code. * +* * int (*ndo_eth_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd); +* Called for ethernet specific ioctls: SIOCGMIIPHY, SIOCGMIIREG, +* SIOCSMIIREG, SIOCSHWTSTAMP and SIOCGHWTSTAMP. +* * int (*ndo_set_config)(struct net_device *dev, struct ifmap *map); * Used to set network devices bus interface parameters. This interface * is retained for legacy reasons; new devices should use the bus
@@ -1361,6 +1365,8 @@ struct net_device_ops {int (*ndo_validate_addr)(struct net_device *dev);int (*ndo_do_ioctl)(struct net_device *dev,struct ifreq *ifr,int cmd); +int (*ndo_eth_ioctl)(struct net_device *dev, +struct ifreq *ifr,int cmd);int (*ndo_siocdevprivate)(struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd);
include/net/dsa.h +7 -7
@@ -106,8 +106,8 @@ struct dsa_device_ops {* function pointers. */ struct dsa_netdevice_ops { -int (*ndo_do_ioctl)(struct net_device *dev,struct ifreq *ifr, -int cmd); +int (*ndo_eth_ioctl)(struct net_device *dev,struct ifreq *ifr, +int cmd); };#define DSA_TAG_DRIVER_ALIAS "dsa_tag-"
@@ -1019,8 +1019,8 @@ static inline int __dsa_netdevice_ops_check(struct net_device *dev)return 0 ; } -static inline int dsa_ndo_do_ioctl (struct net_device *dev,struct ifreq *ifr, -int cmd) +static inline int dsa_ndo_eth_ioctl (struct net_device *dev,struct ifreq *ifr, +int cmd) {const struct dsa_netdevice_ops *ops;int err;
@@ -1031,11 +1031,11 @@ static inline int dsa_ndo_do_ioctl(struct net_device *dev, struct ifreq *ifr, ops = dev->dsa_ptr->netdev_ops; - return ops->ndo_do_ioctl(dev, ifr, cmd); + return ops->ndo_eth_ioctl(dev, ifr, cmd); }#else -static inline int dsa_ndo_do_ioctl (struct net_device *dev,struct ifreq *ifr, -int cmd) +static inline int dsa_ndo_eth_ioctl (struct net_device *dev,struct ifreq *ifr, +int cmd) {return -EOPNOTSUPP ; }
net/8021q/vlan_dev.c +3 -3
@@ -372,8 +372,8 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)case SIOCGMIIREG :case SIOCSMIIREG :case SIOCGHWTSTAMP : -if (netif_device_present (real_dev) && ops->ndo_do_ioctl) - err = ops->ndo_do_ioctl (real_dev, &ifrr, cmd); +if (netif_device_present (real_dev) && ops->ndo_eth_ioctl) + err = ops->ndo_eth_ioctl (real_dev, &ifrr, cmd);break ; }
@@ -814,7 +814,7 @@ static const struct net_device_ops vlan_netdev_ops = { .ndo_set_mac_address = vlan_dev_set_mac_address, .ndo_set_rx_mode = vlan_dev_set_rx_mode, .ndo_change_rx_flags = vlan_dev_change_rx_flags, - .ndo_do_ioctl = vlan_dev_ioctl, + .ndo_eth_ioctl = vlan_dev_ioctl, .ndo_neigh_setup = vlan_dev_neigh_setup, .ndo_get_stats64 = vlan_dev_get_stats64, #if IS_ENABLED(CONFIG_FCOE)
net/core/dev_ioctl.c +27 -11
@@ -239,19 +239,19 @@ static int net_hwtstamp_validate(struct ifreq *ifr)return 0 ; } -static int dev_do_ioctl (struct net_device *dev, -struct ifreq *ifr,unsigned int cmd) +static int dev_eth_ioctl (struct net_device *dev, +struct ifreq *ifr,unsigned int cmd) {const struct net_device_ops *ops = dev->netdev_ops;int err; - err =dsa_ndo_do_ioctl (dev, ifr, cmd); + err =dsa_ndo_eth_ioctl (dev, ifr, cmd);if (err ==0 || err != -EOPNOTSUPP )return err; -if (ops->ndo_do_ioctl) { +if (ops->ndo_eth_ioctl) {if (netif_device_present (dev)) - err = ops->ndo_do_ioctl (dev, ifr, cmd); + err = ops->ndo_eth_ioctl (dev, ifr, cmd);else err = -ENODEV ; }
@@ -259,6 +259,21 @@ static int dev_do_ioctl(struct net_device *dev,return err; } +static int dev_do_ioctl (struct net_device *dev, +struct ifreq *ifr,unsigned int cmd) +{ +const struct net_device_ops *ops = dev->netdev_ops; + +if (ops->ndo_do_ioctl) { +if (netif_device_present (dev)) +return ops->ndo_do_ioctl (dev, ifr, cmd); +else +return -ENODEV ; + } + +return -EOPNOTSUPP ; +} +static int dev_siocdevprivate (struct net_device *dev,struct ifreq *ifr,void __user *data,unsigned int cmd) {
@@ -358,19 +373,20 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, cmd <= SIOCDEVPRIVATE + 15)return dev_siocdevprivate (dev, ifr, data, cmd); -if (cmd ==SIOCBONDENSLAVE || +if (cmd ==SIOCGMIIPHY || + cmd ==SIOCGMIIREG || + cmd ==SIOCSMIIREG || + cmd ==SIOCSHWTSTAMP || + cmd ==SIOCGHWTSTAMP ) { + err =dev_eth_ioctl (dev, ifr, cmd); + }else if (cmd ==SIOCBONDENSLAVE || cmd ==SIOCBONDRELEASE || cmd ==SIOCBONDSETHWADDR || cmd ==SIOCBONDSLAVEINFOQUERY || cmd ==SIOCBONDINFOQUERY || cmd ==SIOCBONDCHANGEACTIVE || - cmd ==SIOCGMIIPHY || - cmd ==SIOCGMIIREG || - cmd ==SIOCSMIIREG || cmd ==SIOCBRADDIF || cmd ==SIOCBRDELIF || - cmd ==SIOCSHWTSTAMP || - cmd ==SIOCGHWTSTAMP || cmd ==SIOCWANDEV ) { err =dev_do_ioctl (dev, ifr, cmd); }else
net/dsa/master.c +3 -3
@@ -210,14 +210,14 @@ static int dsa_master_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)break ; } -if (dev->netdev_ops->ndo_do_ioctl) - err = dev->netdev_ops->ndo_do_ioctl (dev, ifr, cmd); +if (dev->netdev_ops->ndo_eth_ioctl) + err = dev->netdev_ops->ndo_eth_ioctl (dev, ifr, cmd);return err; }static const struct dsa_netdevice_ops dsa_netdev_ops = { - .ndo_do_ioctl = dsa_master_ioctl, + .ndo_eth_ioctl = dsa_master_ioctl, };static int dsa_master_ethtool_setup (struct net_device *dev)
net/dsa/slave.c +1 -1
@@ -1687,7 +1687,7 @@ static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_set_rx_mode = dsa_slave_set_rx_mode, .ndo_set_mac_address = dsa_slave_set_mac_address, .ndo_fdb_dump = dsa_slave_fdb_dump, - .ndo_do_ioctl = dsa_slave_ioctl, + .ndo_eth_ioctl = dsa_slave_ioctl, .ndo_get_iflink = dsa_slave_get_iflink, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_netpoll_setup = dsa_slave_netpoll_setup,
Signature · 1 line
2.29.2
Re: [PATCH net-next v3 27/31] dev_ioctl: split out ndo_eth_ioctl
Quoted 24 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Most users of
ndo_do_ioctlare ethernet drivers that implement the MII commands SIOCGMIIPHY/SIOCGMIIREG/SIOCSMIIREG, or hardware timestamping with SIOCSHWTSTAMP/SIOCGHWTSTAMP.Separate these from the few drivers that use
ndo_do_ioctlto implement SIOCBOND, SIOCBR and SIOCWANDEV commands.This is a purely cosmetic change intended to help readers find their way through the implementation.
Cc Doug Ledford <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Jay Vosburgh <[email protected]>Cc Veaceslav Falico <[email protected]>Cc Andy Gospodarek <[email protected]>Cc Andrew Lunn <[email protected]>Cc Vivien Didelot <[email protected]>Cc Florian Fainelli <[email protected]>Cc Vladimir Oltean <[email protected]>Cc Leon Romanovsky <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Quoted 3 lines
Documentation/networking/netdevices.rst | 4 ++ Documentation/networking/timestamping.rst | 6 +-- drivers/infiniband/ulp/ipoib/ipoib_main.c | 8 ++--
ipoib is a convoluted, but this transform looks OK
Jason
PATCH v3 28/31 net: split out ndo_siowandev ioctl
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
In order to further reduce the scope of ndo_do_ioctl(), move out the SIOCWANDEV handling into a new network device operation function.
Adjust the prototype to only pass the if_settings sub-structure in place of the ifreq, and remove the redundant 'cmd' argument in the process.
--- Documentation/networking/netdevices.rst | 7 ++ drivers/char/pcmcia/synclink_cs.c | 23 +++---- drivers/net/wan/c101.c | 19 +++-- drivers/net/wan/cosa.c | 2 +- drivers/net/wan/farsync.c | 92 +++++++++++-------------- drivers/net/wan/fsl_ucc_hdlc.c | 19 +++-- drivers/net/wan/hdlc.c | 9 +-- drivers/net/wan/hdlc_cisco.c | 14 ++-- drivers/net/wan/hdlc_fr.c | 43 ++++++------ drivers/net/wan/hdlc_ppp.c | 8 +-- drivers/net/wan/hdlc_raw.c | 14 ++-- drivers/net/wan/hdlc_raw_eth.c | 14 ++-- drivers/net/wan/hdlc_x25.c | 16 ++--- drivers/net/wan/hostess_sv11.c | 7 +- drivers/net/wan/ixp4xx_hss.c | 19 +++-- drivers/net/wan/lmc/lmc.h | 2 +- drivers/net/wan/lmc/lmc_main.c | 10 +-- drivers/net/wan/lmc/lmc_proto.c | 7 -- drivers/net/wan/lmc/lmc_proto.h | 1 - drivers/net/wan/n2.c | 19 +++-- drivers/net/wan/pc300too.c | 29 ++++---- drivers/net/wan/pci200syn.c | 19 +++-- drivers/net/wan/sealevel.c | 10 +-- drivers/net/wan/wanxl.c | 21 +++--- drivers/tty/synclink_gt.c | 19 +++-- include/linux/hdlc.h | 4 +- include/linux/netdevice.h | 2 + net/core/dev_ioctl.c | 20 +++++- 28 files changed, 211 insertions(+), 258 deletions(-)
Documentation/networking/netdevices.rst +7 -0
@@ -222,6 +222,13 @@ ndo_do_ioctl: Synchronization: rtnl_lock() semaphore. Context: process +ndo_siocwandev: + Synchronization: rtnl_lock() semaphore. + Context: process + + Used by the drivers/net/wan framework to handle + the SIOCWANDEV ioctl with the if_settings structure. + ndo_siocdevprivate: Synchronization: rtnl_lock() semaphore. Context: process
drivers/char/pcmcia/synclink_cs.c +9 -14
@@ -4050,16 +4050,15 @@ static int hdlcdev_close(struct net_device *dev)* called by network layer to process IOCTL call to network device * * dev pointer to network device structure -* ifr pointer to network interface request structure -* cmd IOCTL command code +* ifs pointer to network interface settings structure * * returns 0 if success, otherwise error code */ -static int hdlcdev_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int hdlcdev_wan_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;MGSLPC_INFO *info =dev_to_port (dev);unsigned int flags;
@@ -4070,17 +4069,14 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (info->port.count)return -EBUSY ; -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); -memset (&new_line,0 , size); -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE :/* return current sync_serial_settings */ - ifr->ifr_settings.type =IF_IFACE_SYNC_SERIAL ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_SYNC_SERIAL ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }
@@ -4148,9 +4144,8 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)tty_kref_put (tty); }return 0 ; -default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -4225,7 +4220,7 @@ static const struct net_device_ops hdlcdev_ops = { .ndo_open = hdlcdev_open, .ndo_stop = hdlcdev_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = hdlcdev_ioctl, + .ndo_siocwandev = hdlcdev_wan_ioctl, .ndo_tx_timeout = hdlcdev_tx_timeout, };
drivers/net/wan/c101.c +8 -11
@@ -228,21 +228,18 @@ static int c101_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return -EOPNOTSUPP ; } -static int c101_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int c101_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;port_t *port =dev_to_port (dev); -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE : - ifr->ifr_settings.type =IF_IFACE_SYNC_SERIAL ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_SYNC_SERIAL ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (line, &port->settings, size))
@@ -270,7 +267,7 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -295,7 +292,7 @@ static const struct net_device_ops c101_ops = { .ndo_open = c101_open, .ndo_stop = c101_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = c101_ioctl, + .ndo_siocwandev = c101_ioctl, .ndo_siocdevprivate = c101_siocdevprivate, };
drivers/net/wan/cosa.c +1 -1
@@ -414,7 +414,7 @@ static const struct net_device_ops cosa_ops = { .ndo_open = cosa_net_open, .ndo_stop = cosa_net_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = hdlc_ioctl, + .ndo_siocwandev = hdlc_ioctl, .ndo_tx_timeout = cosa_net_timeout, };
drivers/net/wan/farsync.c +42 -50
172 lines not on this page · raw message
drivers/net/wan/fsl_ucc_hdlc.c +8 -11
@@ -674,31 +674,28 @@ static irqreturn_t ucc_hdlc_irq_handler(int irq, void *dev_id)return IRQ_HANDLED ; } -static int uhdlc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int uhdlc_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (te1_settings);te1_settings line;struct ucc_hdlc_private *priv =netdev_priv (dev); -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE : - ifr->ifr_settings.type =IF_IFACE_E1 ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_E1 ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }memset (&line,0 ,sizeof (line)); line.clock_type = priv->clocking; -if (copy_to_user (ifr->ifr_settings.ifs_ifsu.sync, &line, size)) +if (copy_to_user (ifs->ifs_ifsu.sync, &line, size))return -EFAULT ;return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -1053,7 +1050,7 @@ static const struct net_device_ops uhdlc_ops = { .ndo_open = uhdlc_open, .ndo_stop = uhdlc_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = uhdlc_ioctl, + .ndo_siocwandev = uhdlc_ioctl, .ndo_tx_timeout = uhdlc_tx_timeout, };
drivers/net/wan/hdlc.c +3 -6
@@ -196,16 +196,13 @@ void hdlc_close(struct net_device *dev) }EXPORT_SYMBOL (hdlc_close); -int hdlc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +int hdlc_ioctl (struct net_device *dev,struct if_settings *ifs) {struct hdlc_proto *proto = first_proto;int result; -if (cmd !=SIOCWANDEV ) -return -EINVAL ; -if (dev_to_hdlc (dev)->proto) { - result =dev_to_hdlc (dev)->proto->ioctl (dev, ifr); + result =dev_to_hdlc (dev)->proto->ioctl (dev, ifs);if (result != -EINVAL )return result; }
@@ -213,7 +210,7 @@ int hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)/* Not handled by currently attached protocol (if any) */ while (proto) { - result = proto->ioctl (dev, ifr); + result = proto->ioctl (dev, ifs);if (result != -EINVAL )return result; proto = proto->next;
drivers/net/wan/hdlc_cisco.c +7 -7
@@ -56,7 +56,7 @@ struct cisco_state {u32 rxseq;/* RX sequence number */ }; -static int cisco_ioctl (struct net_device *dev,struct ifreq *ifr); +static int cisco_ioctl (struct net_device *dev,struct if_settings *ifs);static inline struct cisco_state *state (hdlc_device *hdlc) {
@@ -306,21 +306,21 @@ static const struct header_ops cisco_header_ops = { .create = cisco_hard_header, }; -static int cisco_ioctl (struct net_device *dev,struct ifreq *ifr) +static int cisco_ioctl (struct net_device *dev,struct if_settings *ifs) { -cisco_proto __user *cisco_s = ifr->ifr_settings.ifs_ifsu.cisco; +cisco_proto __user *cisco_s = ifs->ifs_ifsu.cisco;const size_t size =sizeof (cisco_proto);cisco_proto new_settings;hdlc_device *hdlc =dev_to_hdlc (dev);int result; -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_PROTO :if (dev_to_hdlc (dev)->proto != &proto)return -EINVAL ; - ifr->ifr_settings.type =IF_PROTO_CISCO ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_PROTO_CISCO ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (cisco_s, &state (hdlc)->settings, size))
drivers/net/wan/hdlc_fr.c +20 -23
106 lines not on this page · raw message
drivers/net/wan/hdlc_ppp.c +4 -4
@@ -100,7 +100,7 @@ static const char *const event_names[EVENTS] = {static struct sk_buff_head tx_queue;/* used when holding the spin lock */ -static int ppp_ioctl (struct net_device *dev,struct ifreq *ifr); +static int ppp_ioctl (struct net_device *dev,struct if_settings *ifs);static inline struct ppp *get_ppp (struct net_device *dev) {
@@ -655,17 +655,17 @@ static const struct header_ops ppp_header_ops = { .create = ppp_hard_header, }; -static int ppp_ioctl (struct net_device *dev,struct ifreq *ifr) +static int ppp_ioctl (struct net_device *dev,struct if_settings *ifs) {hdlc_device *hdlc =dev_to_hdlc (dev);struct ppp *ppp;int result; -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_PROTO :if (dev_to_hdlc (dev)->proto != &proto)return -EINVAL ; - ifr->ifr_settings.type =IF_PROTO_PPP ; + ifs->type =IF_PROTO_PPP ;return 0 ;/* return protocol only, no settable parameters */ case IF_PROTO_PPP :
drivers/net/wan/hdlc_raw.c +7 -7
@@ -19,7 +19,7 @@#include <linux/skbuff.h> -static int raw_ioctl (struct net_device *dev,struct ifreq *ifr); +static int raw_ioctl (struct net_device *dev,struct if_settings *ifs);static __be16 raw_type_trans (struct sk_buff *skb,struct net_device *dev) {
@@ -33,21 +33,21 @@ static struct hdlc_proto proto = { }; -static int raw_ioctl (struct net_device *dev,struct ifreq *ifr) +static int raw_ioctl (struct net_device *dev,struct if_settings *ifs) { -raw_hdlc_proto __user *raw_s = ifr->ifr_settings.ifs_ifsu.raw_hdlc; +raw_hdlc_proto __user *raw_s = ifs->ifs_ifsu.raw_hdlc;const size_t size =sizeof (raw_hdlc_proto);raw_hdlc_proto new_settings;hdlc_device *hdlc =dev_to_hdlc (dev);int result; -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_PROTO :if (dev_to_hdlc (dev)->proto != &proto)return -EINVAL ; - ifr->ifr_settings.type =IF_PROTO_HDLC ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_PROTO_HDLC ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (raw_s, hdlc->state, size))
drivers/net/wan/hdlc_raw_eth.c +7 -7
@@ -20,7 +20,7 @@#include <linux/rtnetlink.h> #include <linux/skbuff.h> -static int raw_eth_ioctl (struct net_device *dev,struct ifreq *ifr); +static int raw_eth_ioctl (struct net_device *dev,struct if_settings *ifs);static netdev_tx_t eth_tx (struct sk_buff *skb,struct net_device *dev) {
@@ -48,22 +48,22 @@ static struct hdlc_proto proto = { }; -static int raw_eth_ioctl (struct net_device *dev,struct ifreq *ifr) +static int raw_eth_ioctl (struct net_device *dev,struct if_settings *ifs) { -raw_hdlc_proto __user *raw_s = ifr->ifr_settings.ifs_ifsu.raw_hdlc; +raw_hdlc_proto __user *raw_s = ifs->ifs_ifsu.raw_hdlc;const size_t size =sizeof (raw_hdlc_proto);raw_hdlc_proto new_settings;hdlc_device *hdlc =dev_to_hdlc (dev);unsigned int old_qlen;int result; -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_PROTO :if (dev_to_hdlc (dev)->proto != &proto)return -EINVAL ; - ifr->ifr_settings.type =IF_PROTO_HDLC_ETH ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_PROTO_HDLC_ETH ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (raw_s, hdlc->state, size))
drivers/net/wan/hdlc_x25.c +8 -8
@@ -29,7 +29,7 @@ struct x25_state {struct tasklet_struct rx_tasklet; }; -static int x25_ioctl (struct net_device *dev,struct ifreq *ifr); +static int x25_ioctl (struct net_device *dev,struct if_settings *ifs);static struct x25_state *state (hdlc_device *hdlc) {
@@ -274,21 +274,21 @@ static struct hdlc_proto proto = { .module = THIS_MODULE, }; -static int x25_ioctl (struct net_device *dev,struct ifreq *ifr) +static int x25_ioctl (struct net_device *dev,struct if_settings *ifs) { -x25_hdlc_proto __user *x25_s = ifr->ifr_settings.ifs_ifsu.x25; +x25_hdlc_proto __user *x25_s = ifs->ifs_ifsu.x25;const size_t size =sizeof (x25_hdlc_proto);hdlc_device *hdlc =dev_to_hdlc (dev);x25_hdlc_proto new_settings;int result; -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_PROTO :if (dev_to_hdlc (dev)->proto != &proto)return -EINVAL ; - ifr->ifr_settings.type =IF_PROTO_X25 ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_PROTO_X25 ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (x25_s, &state (hdlc)->settings, size))
@@ -303,7 +303,7 @@ static int x25_ioctl(struct net_device *dev, struct ifreq *ifr)return -EBUSY ;/* backward compatibility */ -if (ifr->ifr_settings.size ==0 ) { +if (ifs->size ==0 ) { new_settings.dce =0 ; new_settings.modulo =8 ; new_settings.window =7 ;
drivers/net/wan/hostess_sv11.c +1 -6
@@ -142,11 +142,6 @@ static int hostess_close(struct net_device *d)return 0 ; } -static int hostess_ioctl (struct net_device *d,struct ifreq *ifr,int cmd) -{ -return hdlc_ioctl (d, ifr, cmd); -} -/* Passed network frames, fire them downwind. */
@@ -171,7 +166,7 @@ static const struct net_device_ops hostess_ops = { .ndo_open = hostess_open, .ndo_stop = hostess_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = hostess_ioctl, + .ndo_siocwandev = hdlc_ioctl, };static struct z8530_dev *sv11_init (int iobase,int irq)
drivers/net/wan/ixp4xx_hss.c +8 -11
@@ -1254,23 +1254,20 @@ static void find_best_clock(u32 timer_freq, u32 rate, u32 *best, u32 *reg) } } -static int hss_hdlc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int hss_hdlc_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;struct port *port =dev_to_port (dev);unsigned long flags;int clk; -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE : - ifr->ifr_settings.type =IF_IFACE_V35 ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_V35 ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }memset (&new_line,0 ,sizeof (new_line));
@@ -1323,7 +1320,7 @@ static int hss_hdlc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -1335,7 +1332,7 @@ static const struct net_device_ops hss_hdlc_ops = { .ndo_open = hss_hdlc_open, .ndo_stop = hss_hdlc_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = hss_hdlc_ioctl, + .ndo_siocwandev = hss_hdlc_ioctl, };static int hss_init_one (struct platform_device *pdev)
drivers/net/wan/lmc/lmc.h +1 -1
@@ -19,7 +19,7 @@ void lmc_mii_writereg(lmc_softc_t * const, unsigned, unsigned, unsigned);void lmc_gpio_mkinput (lmc_softc_t *const sc,u32 bits);void lmc_gpio_mkoutput (lmc_softc_t *const sc,u32 bits); -int lmc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +int lmc_ioctl (struct net_device *dev,struct if_settings *ifs);extern lmc_media_t lmc_ds3_media;extern lmc_media_t lmc_ssi_media;
drivers/net/wan/lmc/lmc_main.c +1 -9
@@ -616,14 +616,6 @@ static int lmc_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return ret; } -int lmc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) -{ -if (cmd !=SIOCWANDEV ) -return -EOPNOTSUPP ; - -return lmc_proto_ioctl (dev_to_sc (dev), ifr, cmd); -} -/* the watchdog process that cruises around */ static void lmc_watchdog (struct timer_list *t)/*fold00*/
@@ -794,7 +786,7 @@ static const struct net_device_ops lmc_ops = { .ndo_open = lmc_open, .ndo_stop = lmc_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = lmc_ioctl, + .ndo_siocwandev = hdlc_ioctl, .ndo_siocdevprivate = lmc_siocdevprivate, .ndo_tx_timeout = lmc_driver_timeout, .ndo_get_stats = lmc_get_stats,
drivers/net/wan/lmc/lmc_proto.c +0 -7
@@ -58,13 +58,6 @@ void lmc_proto_attach(lmc_softc_t *sc) /*FOLD00*/ } } -int lmc_proto_ioctl (lmc_softc_t *sc,struct ifreq *ifr,int cmd) -{ -if (sc->if_type ==LMC_PPP ) -return hdlc_ioctl (sc->lmc_device, ifr, cmd); -return -EOPNOTSUPP ; -} -int lmc_proto_open (lmc_softc_t *sc) {int ret =0 ;
drivers/net/wan/lmc/lmc_proto.h +0 -1
@@ -5,7 +5,6 @@#include <linux/hdlc.h> void lmc_proto_attach (lmc_softc_t *sc); -int lmc_proto_ioctl (lmc_softc_t *sc,struct ifreq *ifr,int cmd);int lmc_proto_open (lmc_softc_t *sc);void lmc_proto_close (lmc_softc_t *sc);__be16 lmc_proto_type (lmc_softc_t *sc,struct sk_buff *skb);
drivers/net/wan/n2.c +8 -11
@@ -239,21 +239,18 @@ static int n2_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return -EOPNOTSUPP ; } -static int n2_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int n2_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;port_t *port =dev_to_port (dev); -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE : - ifr->ifr_settings.type =IF_IFACE_SYNC_SERIAL ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_SYNC_SERIAL ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (line, &port->settings, size))
@@ -281,7 +278,7 @@ static int n2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -317,7 +314,7 @@ static const struct net_device_ops n2_ops = { .ndo_open = n2_open, .ndo_stop = n2_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = n2_ioctl, + .ndo_siocwandev = n2_ioctl, .ndo_siocdevprivate = n2_siocdevprivate, };
drivers/net/wan/pc300too.c +13 -16
@@ -186,21 +186,18 @@ static int pc300_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return -EOPNOTSUPP ; } -static int pc300_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int pc300_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;int new_type;port_t *port =dev_to_port (dev); -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -if (ifr->ifr_settings.type ==IF_GET_IFACE ) { - ifr->ifr_settings.type = port->iface; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ +if (ifs->type ==IF_GET_IFACE ) { + ifs->type = port->iface; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (line, &port->settings, size))
@@ -209,21 +206,21 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) }if (port->card->type ==PC300_X21 && - (ifr->ifr_settings.type ==IF_IFACE_SYNC_SERIAL || - ifr->ifr_settings.type ==IF_IFACE_X21 )) + (ifs->type ==IF_IFACE_SYNC_SERIAL || + ifs->type ==IF_IFACE_X21 )) new_type =IF_IFACE_X21 ;else if (port->card->type ==PC300_RSV && - (ifr->ifr_settings.type ==IF_IFACE_SYNC_SERIAL || - ifr->ifr_settings.type ==IF_IFACE_V35 )) + (ifs->type ==IF_IFACE_SYNC_SERIAL || + ifs->type ==IF_IFACE_V35 )) new_type =IF_IFACE_V35 ;else if (port->card->type ==PC300_RSV && - ifr->ifr_settings.type ==IF_IFACE_V24 ) + ifs->type ==IF_IFACE_V24 ) new_type =IF_IFACE_V24 ;else -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs);if (!capable (CAP_NET_ADMIN ))return -EPERM ;
@@ -278,7 +275,7 @@ static const struct net_device_ops pc300_ops = { .ndo_open = pc300_open, .ndo_stop = pc300_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = pc300_ioctl, + .ndo_siocwandev = pc300_ioctl, .ndo_siocdevprivate = pc300_siocdevprivate, };
drivers/net/wan/pci200syn.c +8 -11
@@ -179,21 +179,18 @@ static int pci200_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return -EOPNOTSUPP ; } -static int pci200_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int pci200_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;port_t *port =dev_to_port (dev); -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE : - ifr->ifr_settings.type =IF_IFACE_V35 ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_V35 ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }if (copy_to_user (line, &port->settings, size))
@@ -223,7 +220,7 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -259,7 +256,7 @@ static const struct net_device_ops pci200_ops = { .ndo_open = pci200_open, .ndo_stop = pci200_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = pci200_ioctl, + .ndo_siocwandev = pci200_ioctl, .ndo_siocdevprivate = pci200_siocdevprivate, };
drivers/net/wan/sealevel.c +1 -9
@@ -124,14 +124,6 @@ static int sealevel_close(struct net_device *d)return 0 ; } -static int sealevel_ioctl (struct net_device *d,struct ifreq *ifr,int cmd) -{ -/* struct slvl_device *slvl=dev_to_chan(d); -* z8530_ioctl(d,&slvl->sync.chanA,ifr,cmd) -*/ -return hdlc_ioctl (d, ifr, cmd); -} -/* Passed network frames, fire them downwind. */ static netdev_tx_t sealevel_queue_xmit(struct sk_buff *skb,
@@ -152,7 +144,7 @@ static const struct net_device_ops sealevel_ops = { .ndo_open = sealevel_open, .ndo_stop = sealevel_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = sealevel_ioctl, + .ndo_siocwandev = hdlc_ioctl, };static int slvl_setup (struct slvl_device *sv,int iobase,int irq)
drivers/net/wan/wanxl.c +9 -12
@@ -343,20 +343,17 @@ static int wanxl_attach(struct net_device *dev, unsigned short encoding,return 0 ; } -static int wanxl_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int wanxl_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings line;struct port *port =dev_to_port (dev); -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); - -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE : - ifr->ifr_settings.type =IF_IFACE_SYNC_SERIAL ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_SYNC_SERIAL ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }memset (&line,0 ,sizeof (line));
@@ -364,7 +361,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) line.clock_rate =0 ; line.loopback =0 ; -if (copy_to_user (ifr->ifr_settings.ifs_ifsu.sync, &line, size)) +if (copy_to_user (ifs->ifs_ifsu.sync, &line, size))return -EFAULT ;return 0 ;
@@ -374,7 +371,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (dev->flags &IFF_UP )return -EBUSY ; -if (copy_from_user (&line, ifr->ifr_settings.ifs_ifsu.sync, +if (copy_from_user (&line, ifs->ifs_ifsu.sync, size))return -EFAULT ;
@@ -389,7 +386,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -545,7 +542,7 @@ static const struct net_device_ops wanxl_ops = { .ndo_open = wanxl_open, .ndo_stop = wanxl_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = wanxl_ioctl, + .ndo_siocwandev = wanxl_ioctl, .ndo_get_stats = wanxl_get_stats, };
drivers/tty/synclink_gt.c +8 -11
@@ -1524,11 +1524,11 @@ static int hdlcdev_close(struct net_device *dev)* * Return: 0 if success, otherwise error code */ -static int hdlcdev_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) +static int hdlcdev_ioctl (struct net_device *dev,struct if_settings *ifs) {const size_t size =sizeof (sync_serial_settings);sync_serial_settings new_line; -sync_serial_settings __user *line = ifr->ifr_settings.ifs_ifsu.sync; +sync_serial_settings __user *line = ifs->ifs_ifsu.sync;struct slgt_info *info =dev_to_port (dev);unsigned int flags;
@@ -1538,17 +1538,14 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (info->port.count)return -EBUSY ; -if (cmd !=SIOCWANDEV ) -return hdlc_ioctl (dev, ifr, cmd); -memset (&new_line,0 ,sizeof (new_line)); -switch (ifr->ifr_settings.type) { +switch (ifs->type) {case IF_GET_IFACE :/* return current sync_serial_settings */ - ifr->ifr_settings.type =IF_IFACE_SYNC_SERIAL ; -if (ifr->ifr_settings.size < size) { - ifr->ifr_settings.size = size;/* data size wanted */ + ifs->type =IF_IFACE_SYNC_SERIAL ; +if (ifs->size < size) { + ifs->size = size;/* data size wanted */ return -ENOBUFS ; }
@@ -1615,7 +1612,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)return 0 ;default : -return hdlc_ioctl (dev, ifr, cmd); +return hdlc_ioctl (dev, ifs); } }
@@ -1688,7 +1685,7 @@ static const struct net_device_ops hdlcdev_ops = { .ndo_open = hdlcdev_open, .ndo_stop = hdlcdev_close, .ndo_start_xmit = hdlc_start_xmit, - .ndo_do_ioctl = hdlcdev_ioctl, + .ndo_siocwandev = hdlcdev_ioctl, .ndo_tx_timeout = hdlcdev_tx_timeout, };
include/linux/hdlc.h +2 -2
@@ -22,7 +22,7 @@ struct hdlc_proto {void (*start)(struct net_device *dev);/* if open & DCD */ void (*stop)(struct net_device *dev);/* if open & !DCD */ void (*detach)(struct net_device *dev); -int (*ioctl)(struct net_device *dev,struct ifreq *ifr); +int (*ioctl)(struct net_device *dev,struct if_settings *ifs);__be16 (*type_trans)(struct sk_buff *skb,struct net_device *dev);int (*netif_rx)(struct sk_buff *skb);netdev_tx_t (*xmit)(struct sk_buff *skb,struct net_device *dev);
@@ -54,7 +54,7 @@ typedef struct hdlc_device {/* Exported from hdlc module */ /* Called by hardware driver when a user requests HDLC service */ -int hdlc_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd); +int hdlc_ioctl (struct net_device *dev,struct if_settings *ifs);/* Must be used by hardware driver on module startup/exit */ #define register_hdlc_device (dev) register_netdev(dev)
include/linux/netdevice.h +2 -0
@@ -1367,6 +1367,8 @@ struct net_device_ops { struct ifreq *ifr, int cmd);int (*ndo_eth_ioctl)(struct net_device *dev,struct ifreq *ifr,int cmd); +int (*ndo_siocwandev)(struct net_device *dev, +struct if_settings *ifs);int (*ndo_siocdevprivate)(struct net_device *dev,struct ifreq *ifr,void __user *data,int cmd);
net/core/dev_ioctl.c +18 -2
@@ -291,6 +291,20 @@ static int dev_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return dev_do_ioctl (dev, ifr, cmd); } +static int dev_siocwandev (struct net_device *dev,struct if_settings *ifs) +{ +const struct net_device_ops *ops = dev->netdev_ops; + +if (ops->ndo_siocwandev) { +if (netif_device_present (dev)) +return ops->ndo_siocwandev (dev, ifs); +else +return -ENODEV ; + } + +return -EOPNOTSUPP ; +} +/* * Perform the SIOCxIFxxx calls, inside rtnl_lock() */
@@ -359,6 +373,9 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, ifr->ifr_newname[IFNAMSIZ -1 ] ='\0' ;return dev_change_name (dev, ifr->ifr_newname); +case SIOCWANDEV : +return dev_siocwandev (dev, &ifr->ifr_settings); +case SIOCSHWTSTAMP : err =net_hwtstamp_validate (ifr);if (err)
@@ -386,8 +403,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, cmd == SIOCBONDINFOQUERY || cmd == SIOCBONDCHANGEACTIVE || cmd == SIOCBRADDIF || - cmd == SIOCBRDELIF || - cmd == SIOCWANDEV) { + cmd == SIOCBRDELIF) { err =dev_do_ioctl (dev, ifr, cmd); } else err = -EINVAL ;
Signature · 1 line
2.29.2
PATCH v3 29/31 net: socket: return changed ifreq from SIOCDEVPRIVATE
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Some drivers that use SIOCDEVPRIVATE ioctl commands modify the ifreq structure and expect it to be passed back to user space, which has never really happened for compat mode because the calling these drivers through ndo_do_ioctl requires overwriting the ifr_data pointer.
Now that all drivers are converted to ndo_siocdevprivate, change it to handle this correctly in both compat and native mode.
--- net/core/dev_ioctl.c | 4 +--- net/socket.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)
net/core/dev_ioctl.c +1 -3
@@ -286,9 +286,7 @@ static int dev_siocdevprivate(struct net_device *dev, struct ifreq *ifr,return -ENODEV ; } -/* fall back to do_ioctl for drivers not yet converted */ - ifr->ifr_data = data; -return dev_do_ioctl (dev, ifr, cmd); +return -EOPNOTSUPP ; }static int dev_siocwandev (struct net_device *dev,struct if_settings *ifs)
net/socket.c +1 -1
@@ -3234,7 +3234,7 @@ static int compat_sock_ioctl_trans(struct file *file, struct socket *sock,struct net *net =sock_net (sk);if (cmd >=SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE +15 )) -return compat_ifr_data_ioctl (net, cmd, argp); +return sock_ioctl (file, cmd, (unsigned long )argp);switch (cmd) {case SIOCSIFBR :
Signature · 1 line
2.29.2
PATCH v3 30/31 net: bridge: move bridge ioctls out of .ndo_do_ioctl
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
Working towards obsoleting the .ndo_do_ioctl operation entirely, stop passing the SIOCBRADDIF/SIOCBRDELIF device ioctl commands into this callback.
My first attempt was to add another ndo_siocbr() callback, but as there is only a single driver that takes these commands and there is already a hook mechanism to call directly into this driver, extend this hook instead, and use it for both the deviceless and the device specific ioctl commands.
--- include/linux/if_bridge.h | 7 ++++++- net/bridge/br.c | 2 +- net/bridge/br_device.c | 1 - net/bridge/br_ioctl.c | 15 +++------------ net/bridge/br_private.h | 5 ++--- net/core/dev_ioctl.c | 11 ++++++++--- net/socket.c | 33 +++++++++++++++++++++++---------- 7 files changed, 43 insertions(+), 31 deletions(-)
include/linux/if_bridge.h +6 -1
@@ -61,7 +61,12 @@ struct br_ip_list {#define BR_DEFAULT_AGEING_TIME (300 * HZ) -extern void brioctl_set (int (*ioctl_hook)(struct net *,unsigned int ,void __user *)); +struct net_bridge ; +void brioctl_set (int (*hook)(struct net *net,struct net_bridge *br, +unsigned int cmd,struct ifreq *ifr, +void __user *uarg)); +int br_ioctl_call (struct net *net,struct net_bridge *br,unsigned int cmd, +struct ifreq *ifr,void __user *uarg);#if IS_ENABLED (CONFIG_BRIDGE ) &&IS_ENABLED (CONFIG_BRIDGE_IGMP_SNOOPING ) int br_multicast_list_adjacent(struct net_device *dev,
net/bridge/br.c +1 -1
@@ -359,7 +359,7 @@ static int __init br_init(void)if (err) goto err_out5; -brioctl_set (br_ioctl_deviceless_stub); +brioctl_set (br_ioctl_stub);#if IS_ENABLED (CONFIG_ATM_LANE ) br_fdb_test_addr_hook = br_fdb_test_addr;
net/bridge/br_device.c +0 -1
@@ -454,7 +454,6 @@ static const struct net_device_ops br_netdev_ops = { .ndo_set_rx_mode = br_dev_set_multicast_list, .ndo_change_rx_flags = br_dev_change_rx_flags, .ndo_change_mtu = br_change_mtu, - .ndo_do_ioctl = br_dev_ioctl, .ndo_siocdevprivate = br_dev_siocdevprivate, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_netpoll_setup = br_netpoll_setup,
net/bridge/br_ioctl.c +3 -12
@@ -366,7 +366,8 @@ static int old_deviceless(struct net *net, void __user *uarg)return -EOPNOTSUPP ; } -int br_ioctl_deviceless_stub (struct net *net,unsigned int cmd,void __user *uarg) +int br_ioctl_stub (struct net *net,struct net_bridge *br,unsigned int cmd, +struct ifreq *ifr,void __user *uarg) {switch (cmd) {case SIOCGIFBR :
@@ -390,21 +391,11 @@ int br_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *uarreturn br_del_bridge (net, buf); } - } -return -EOPNOTSUPP ; -} - -int br_dev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd) -{ -struct net_bridge *br =netdev_priv (dev); -switch (cmd) {case SIOCBRADDIF :case SIOCBRDELIF : -return add_del_if (br, rq->ifr_ifindex, cmd ==SIOCBRADDIF ); +return add_del_if (br, ifr->ifr_ifindex, cmd ==SIOCBRADDIF ); } - -br_debug (br,"Bridge does not support ioctl 0x%x\n" , cmd);return -EOPNOTSUPP ; }
net/bridge/br_private.h +2 -3
@@ -851,11 +851,10 @@ br_port_get_check_rtnl(const struct net_device *dev) }/* br_ioctl.c */ -int br_dev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);int br_dev_siocdevprivate (struct net_device *dev,struct ifreq *rq,void __user *data,int cmd); -int br_ioctl_deviceless_stub (struct net *net,unsigned int cmd, -void __user *arg); +int br_ioctl_stub (struct net *net,struct net_bridge *br,unsigned int cmd, +struct ifreq *ifr,void __user *uarg);/* br_multicast.c */ #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
net/core/dev_ioctl.c +8 -3
@@ -6,6 +6,7 @@#include <linux/rtnetlink.h> #include <linux/net_tstamp.h> #include <linux/wireless.h> +#include <linux/if_bridge.h> #include <net/dsa.h> #include <net/wext.h>
@@ -374,6 +375,12 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data,case SIOCWANDEV :return dev_siocwandev (dev, &ifr->ifr_settings); +case SIOCBRADDIF : +case SIOCBRDELIF : +if (!netif_device_present (dev)) +return -ENODEV ; +return br_ioctl_call (net,netdev_priv (dev), cmd, ifr,NULL ); +case SIOCSHWTSTAMP : err =net_hwtstamp_validate (ifr);if (err)
@@ -399,9 +406,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, cmd == SIOCBONDSETHWADDR || cmd == SIOCBONDSLAVEINFOQUERY || cmd == SIOCBONDINFOQUERY || - cmd == SIOCBONDCHANGEACTIVE || - cmd == SIOCBRADDIF || - cmd == SIOCBRDELIF) { + cmd == SIOCBONDCHANGEACTIVE) { err =dev_do_ioctl (dev, ifr, cmd); } else err = -EINVAL ;
net/socket.c +23 -10
@@ -1064,9 +1064,13 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)*/ static DEFINE_MUTEX (br_ioctl_mutex); -static int (*br_ioctl_hook) (struct net *,unsigned int cmd,void __user *arg); +static int (*br_ioctl_hook)(struct net *net,struct net_bridge *br, +unsigned int cmd,struct ifreq *ifr, +void __user *uarg); -void brioctl_set (int (*hook) (struct net *,unsigned int ,void __user *)) +void brioctl_set (int (*hook)(struct net *net,struct net_bridge *br, +unsigned int cmd,struct ifreq *ifr, +void __user *uarg)) {mutex_lock (&br_ioctl_mutex); br_ioctl_hook = hook;
@@ -1074,6 +1078,22 @@ void brioctl_set(int (*hook) (struct net *, unsigned int, void __user *)) }EXPORT_SYMBOL (brioctl_set); +int br_ioctl_call (struct net *net,struct net_bridge *br,unsigned int cmd, +struct ifreq *ifr,void __user *uarg) +{ +int err = -ENOPKG ; + +if (!br_ioctl_hook) +request_module ("bridge" ); + +mutex_lock (&br_ioctl_mutex); +if (br_ioctl_hook) + err =br_ioctl_hook (net, br, cmd, ifr, uarg); +mutex_unlock (&br_ioctl_mutex); + +return err; +} +static DEFINE_MUTEX (vlan_ioctl_mutex);static int (*vlan_ioctl_hook) (struct net *,void __user *arg);
@@ -1162,14 +1182,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)case SIOCSIFBR :case SIOCBRADDBR :case SIOCBRDELBR : - err = -ENOPKG ; -if (!br_ioctl_hook) -request_module ("bridge" ); - -mutex_lock (&br_ioctl_mutex); -if (br_ioctl_hook) - err =br_ioctl_hook (net, cmd, argp); -mutex_unlock (&br_ioctl_mutex); + err =br_ioctl_call (net,NULL , cmd,NULL , argp);break ;case SIOCGIFVLAN :case SIOCSIFVLAN :
Signature · 1 line
2.29.2
PATCH v3 31/31 net: bonding: move ioctl handling to private ndo operation
In reply to Arnd BergmannFrom: Arnd Bergmann <[email protected]>
All other user triggered operations are gone from ndo_ioctl, so move the SIOCBOND family into a custom operation as well.
The .ndo_ioctl() helper is no longer called by the dev_ioctl.c code now, but there are still a few definitions in obsolete wireless drivers as well as the appletalk and ieee802154 layers to call SIOCSIFADDR/SIOCGIFADDR helpers from inside the kernel.
--- Documentation/networking/netdevices.rst | 11 +++++++++++ drivers/net/bonding/bond_main.c | 2 +- include/linux/netdevice.h | 13 ++++++++++--- net/core/dev_ioctl.c | 8 ++++---- 4 files changed, 26 insertions(+), 8 deletions(-)
Documentation/networking/netdevices.rst +11 -0
@@ -222,6 +222,17 @@ ndo_do_ioctl: Synchronization: rtnl_lock() semaphore. Context: process + This is only called by network subsystems internally, + not by user space calling ioctl as it was in before + linux-5.14. + +ndo_siocbond: + Synchronization: rtnl_lock() semaphore. + Context: process + + Used by the bonding driver for the SIOCBOND family of + ioctl commands. + ndo_siocwandev: Synchronization: rtnl_lock() semaphore. Context: process
drivers/net/bonding/bond_main.c +1 -1
@@ -4988,7 +4988,7 @@ static const struct net_device_ops bond_netdev_ops = { .ndo_select_queue = bond_select_queue, .ndo_get_stats64 = bond_get_stats, .ndo_eth_ioctl = bond_eth_ioctl, - .ndo_do_ioctl = bond_do_ioctl, + .ndo_siocbond = bond_do_ioctl, .ndo_siocdevprivate = bond_siocdevprivate, .ndo_change_rx_flags = bond_change_rx_flags, .ndo_set_rx_mode = bond_set_rx_mode,
include/linux/netdevice.h +10 -3
@@ -1086,9 +1086,14 @@ struct netdev_net_notifier {* Test if Media Access Control address is valid for the device. * * int (*ndo_do_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd); -* Called when a user requests an ioctl which can't be handled by -* the generic interface code. If not defined ioctls return -* not supported error code. +* Old-style ioctl entry point. This is used internally by the +* appletalk and ieee802154 subsystems but is no longer called by +* the device ioctl handler. +* +* int (*ndo_siocbond)(struct net_device *dev, struct ifreq *ifr, int cmd); +* Used by the bonding driver for its device specific ioctls: +* SIOCBONDENSLAVE, SIOCBONDRELEASE, SIOCBONDSETHWADDR, SIOCBONDCHANGEACTIVE, +* SIOCBONDSLAVEINFOQUERY, and SIOCBONDINFOQUERY * * * int (*ndo_eth_ioctl)(struct net_device *dev, struct ifreq *ifr, int cmd); * Called for ethernet specific ioctls: SIOCGMIIPHY, SIOCGMIIREG,
@@ -1367,6 +1372,8 @@ struct net_device_ops { struct ifreq *ifr, int cmd);int (*ndo_eth_ioctl)(struct net_device *dev,struct ifreq *ifr,int cmd); +int (*ndo_siocbond)(struct net_device *dev, +struct ifreq *ifr,int cmd);int (*ndo_siocwandev)(struct net_device *dev,struct if_settings *ifs); int (*ndo_siocdevprivate)(struct net_device *dev,
net/core/dev_ioctl.c +4 -4
@@ -260,14 +260,14 @@ static int dev_eth_ioctl(struct net_device *dev,return err; } -static int dev_do_ioctl (struct net_device *dev, +static int dev_siocbond (struct net_device *dev,struct ifreq *ifr,unsigned int cmd) {const struct net_device_ops *ops = dev->netdev_ops; -if (ops->ndo_do_ioctl) { +if (ops->ndo_siocbond) {if (netif_device_present (dev)) -return ops->ndo_do_ioctl (dev, ifr, cmd); +return ops->ndo_siocbond (dev, ifr, cmd);else return -ENODEV ; }
@@ -407,7 +407,7 @@ static int dev_ifsioc(struct net *net, struct ifreq *ifr, void __user *data, cmd == SIOCBONDSLAVEINFOQUERY || cmd == SIOCBONDINFOQUERY || cmd == SIOCBONDCHANGEACTIVE) { - err =dev_do_ioctl (dev, ifr, cmd); + err =dev_siocbond (dev, ifr, cmd); } else err = -EINVAL ;
Signature · 1 line
2.29.2
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 6 lines · On Tue, 27 Jul 2021 15:44:46 +0200 you wrote:
From: Arnd Bergmann <[email protected]>
This series is a follow-up to the series for removing
compat_alloc_user_space()andcopy_in_user()that has now been merged.
Quoted 6 lines
I wanted to be sure I address all the ways that 'struct ifreq' is used in device drivers through .ndo_do_ioctl, originally to prove that my approach of changing the struct definition was correct, but then I discarded that approach and went on anyway.
[...]
Here is the summary with links:
- [net-next,v3,01/31] net: split out SIOCDEVPRIVATE handling from dev_ioctl
https://git.kernel.org/netdev/net-next/c/b9067f5dc4a0 - [net-next,v3,02/31] staging: rtlwifi: use siocdevprivate https://git.kernel.org/netdev/net-next/c/89939e890605 - [net-next,v3,03/31] staging: wlan-ng: use siocdevprivate https://git.kernel.org/netdev/net-next/c/3343c49a959d - [net-next,v3,04/31] hostap: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/3f3fa5340745 - [net-next,v3,05/31] bridge: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/561d8352818f - [net-next,v3,06/31] phonet: use siocdevprivate https://git.kernel.org/netdev/net-next/c/4747c1a8bc50 - [net-next,v3,07/31] tulip: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/029a4fef6b22 - [net-next,v3,08/31] bonding: use siocdevprivate https://git.kernel.org/netdev/net-next/c/232ec98ec35d - [net-next,v3,09/31] appletalk: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/dbecb011eb78 - [net-next,v3,10/31] hamachi: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/99b78a37a371 - [net-next,v3,11/31] tehuti: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/32d05468c462 - [net-next,v3,12/31] eql: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/d92f7b59d32b - [net-next,v3,13/31] fddi: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/043393d8b478 - [net-next,v3,14/31] net: usb: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/ef1b5b0c30bc - [net-next,v3,15/31] slip/plip: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/76b5878cffab - [net-next,v3,16/31] qeth: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/18787eeebd71 - [net-next,v3,17/31] cxgb3: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/ebb4a911e09a - [net-next,v3,18/31] hamradio: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/25ec92fbdd23 - [net-next,v3,19/31] airo: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/ae6af0120dda - [net-next,v3,20/31] ip_tunnel: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/3e7a1c7c561e - [net-next,v3,21/31] hippi: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/81a68110a22a - [net-next,v3,22/31] sb1000: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/cc0aa831a0d9 - [net-next,v3,23/31] ppp: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/34f7cac07c4e - [net-next,v3,24/31] wan: use ndo_siocdevprivate https://git.kernel.org/netdev/net-next/c/73d74f61a559 - [net-next,v3,25/31] wan: cosa: remove dead cosa_net_ioctl() function https://git.kernel.org/netdev/net-next/c/8fb75b79cd98 - [net-next,v3,26/31] dev_ioctl: pass SIOCDEVPRIVATE data separately https://git.kernel.org/netdev/net-next/c/a554bf96b49d - [net-next,v3,27/31] dev_ioctl: split out ndo_eth_ioctl https://git.kernel.org/netdev/net-next/c/a76053707dbf - [net-next,v3,28/31] net: split out ndo_siowandev ioctl https://git.kernel.org/netdev/net-next/c/ad7eab2ab014 - [net-next,v3,29/31] net: socket: return changed ifreq from SIOCDEVPRIVATE https://git.kernel.org/netdev/net-next/c/88fc023f7de2 - [net-next,v3,30/31] net: bridge: move bridge ioctls out of .ndo_do_ioctl https://git.kernel.org/netdev/net-next/c/ad2f99aedf8f - [net-next,v3,31/31] net: bonding: move ioctl handling to private ndo operation https://git.kernel.org/netdev/net-next/c/3d9d00bd1885
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html