Commit 712d6954 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

netns bridge: cleanup bridges during netns stop 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarStephen Hemminger <shemming@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4aa678ba

net/bridge/br.c

+16 −6
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ static const struct stp_proto br_stp_proto = { 
	.rcv	= br_stp_rcv,

};



static struct pernet_operations br_net_ops = {

	.exit	= br_net_exit,

};



static int __init br_init(void)

{

	int err;
@@ -42,18 +46,22 @@ static int __init br_init(void) 
	if (err)

		goto err_out;



	err = br_netfilter_init();

	err = register_pernet_subsys(&br_net_ops);

	if (err)

		goto err_out1;



	err = register_netdevice_notifier(&br_device_notifier);

	err = br_netfilter_init();

	if (err)

		goto err_out2;



	err = br_netlink_init();

	err = register_netdevice_notifier(&br_device_notifier);

	if (err)

		goto err_out3;



	err = br_netlink_init();

	if (err)

		goto err_out4;



	brioctl_set(br_ioctl_deviceless_stub);

	br_handle_frame_hook = br_handle_frame;
@@ -61,10 +69,12 @@ static int __init br_init(void) 
	br_fdb_put_hook = br_fdb_put;



	return 0;

err_out3:

err_out4:

	unregister_netdevice_notifier(&br_device_notifier);

err_out2:

err_out3:

	br_netfilter_fini();

err_out2:

	unregister_pernet_subsys(&br_net_ops);

err_out1:

	br_fdb_fini();

err_out:
@@ -80,7 +90,7 @@ static void __exit br_deinit(void) 
	unregister_netdevice_notifier(&br_device_notifier);

	brioctl_set(NULL);



	br_cleanup_bridges();

	unregister_pernet_subsys(&br_net_ops);



	synchronize_net();

net/bridge/br_if.c

+2 −2
Original line number Diff line number Diff line
@@ -446,13 +446,13 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) 
	return 0;

}



void __exit br_cleanup_bridges(void)

void br_net_exit(struct net *net)

{

	struct net_device *dev;



	rtnl_lock();

restart:

	for_each_netdev(&init_net, dev) {

	for_each_netdev(net, dev) {

		if (dev->priv_flags & IFF_EBRIDGE) {

			del_br(dev->priv);

			goto restart;

net/bridge/br_private.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ extern void br_flood_forward(struct net_bridge *br, struct sk_buff *skb); 
extern void br_port_carrier_check(struct net_bridge_port *p);

extern int br_add_bridge(struct net *net, const char *name);

extern int br_del_bridge(struct net *net, const char *name);

extern void br_cleanup_bridges(void);

extern void br_net_exit(struct net *net);

extern int br_add_if(struct net_bridge *br,

	      struct net_device *dev);

extern int br_del_if(struct net_bridge *br,