Commit afc6151a authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bridge: implement [add/del]_slave ops 



add possibility to addif/delif via rtnetlink

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9232ecca

net/bridge/br_device.c

+17 −0
Original line number Diff line number Diff line
@@ -297,6 +297,21 @@ void br_netpoll_disable(struct net_bridge_port *p) 


#endif



static int br_add_slave(struct net_device *dev, struct net_device *slave_dev)



{

	struct net_bridge *br = netdev_priv(dev);



	return br_add_if(br, slave_dev);

}



static int br_del_slave(struct net_device *dev, struct net_device *slave_dev)

{

	struct net_bridge *br = netdev_priv(dev);



	return br_del_if(br, slave_dev);

}



static const struct ethtool_ops br_ethtool_ops = {

	.get_drvinfo    = br_getinfo,

	.get_link	= ethtool_op_get_link,
@@ -326,6 +341,8 @@ static const struct net_device_ops br_netdev_ops = { 
	.ndo_netpoll_cleanup	 = br_netpoll_cleanup,

	.ndo_poll_controller	 = br_poll_controller,

#endif

	.ndo_add_slave		 = br_add_slave,

	.ndo_del_slave		 = br_del_slave,

};



static void br_dev_free(struct net_device *dev)

net/bridge/br_if.c

+10 −1
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ static void del_nbp(struct net_bridge_port *p) 


	netdev_rx_handler_unregister(dev);



	netdev_set_master(dev, NULL);



	br_multicast_del_port(p);



	kobject_uevent(&p->kobj, KOBJ_REMOVE);
@@ -429,10 +431,14 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
	if (br_netpoll_info(br) && ((err = br_netpoll_enable(p))))

		goto err3;



	err = netdev_rx_handler_register(dev, br_handle_frame, p);

	err = netdev_set_master(dev, br->dev);

	if (err)

		goto err3;



	err = netdev_rx_handler_register(dev, br_handle_frame, p);

	if (err)

		goto err4;



	dev->priv_flags |= IFF_BRIDGE_PORT;



	dev_disable_lro(dev);
@@ -455,6 +461,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 
	kobject_uevent(&p->kobj, KOBJ_ADD);



	return 0;



err4:

	netdev_set_master(dev, NULL);

err3:

	sysfs_remove_link(br->ifobj, p->dev->name);

err2: