Commit ad2f99ae authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88fc023f

include/linux/if_bridge.h

+6 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 *uar 


		return 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
Original line number Diff line number Diff line
@@ -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