diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-07-27 15:45:16 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-07-27 20:11:45 +0100 |
| commit | ad2f99aedf8fa77f3ae647153284fa63c43d3055 (patch) | |
| tree | 555d6a10cc82eb3910c56a05b1b2af2fc0588b07 /net/bridge/br_private.h | |
| parent | net: socket: return changed ifreq from SIOCDEVPRIVATE (diff) | |
| download | linux-dev-ad2f99aedf8fa77f3ae647153284fa63c43d3055.tar.xz linux-dev-ad2f99aedf8fa77f3ae647153284fa63c43d3055.zip | |
net: bridge: move bridge ioctls out of .ndo_do_ioctl
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.
Cc: Roopa Prabhu <roopa@nvidia.com>
Cc: Nikolay Aleksandrov <nikolay@nvidia.com>
Cc: bridge@lists.linux-foundation.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/bridge/br_private.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 572c28ae41b8..f2d34ea1ea37 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -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 |