lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netns bridge: cleanup bridges during netns stop

Browse Source 
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Stephen Hemminger <shemming@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexey Dobriyan
2008-09-08 16:20:18 -07:00
committed by David S. Miller
parent 4aa678ba44
commit 712d6954e3
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
net/bridge/br.c
View File

@@ -28,6 +28,10 @@ static const struct stp_proto br_stp_proto = {
.rcv = br_stp_rcv, .rcv = br_stp_rcv,
}; };
static struct pernet_operations br_net_ops = {
.exit = br_net_exit,
};
static int __init br_init(void) static int __init br_init(void)
{ {
int err; int err;
@@ -42,18 +46,22 @@ static int __init br_init(void)
if (err) if (err)
goto err_out; goto err_out;
err = br_netfilter_init(); err = register_pernet_subsys(&br_net_ops);
if (err) if (err)
goto err_out1; goto err_out1;
err = register_netdevice_notifier(&br_device_notifier); err = br_netfilter_init();
if (err) if (err)
goto err_out2; goto err_out2;
err = br_netlink_init(); err = register_netdevice_notifier(&br_device_notifier);
if (err) if (err)
goto err_out3; goto err_out3;
err = br_netlink_init();
if (err)
goto err_out4;
brioctl_set(br_ioctl_deviceless_stub); brioctl_set(br_ioctl_deviceless_stub);
br_handle_frame_hook = br_handle_frame; br_handle_frame_hook = br_handle_frame;
@@ -61,10 +69,12 @@ static int __init br_init(void)
br_fdb_put_hook = br_fdb_put; br_fdb_put_hook = br_fdb_put;
return 0; return 0;
err_out3: err_out4:
unregister_netdevice_notifier(&br_device_notifier); unregister_netdevice_notifier(&br_device_notifier);
err_out2: err_out3:
br_netfilter_fini(); br_netfilter_fini();
err_out2:
unregister_pernet_subsys(&br_net_ops);
err_out1: err_out1:
br_fdb_fini(); br_fdb_fini();
err_out: err_out:
@@ -80,7 +90,7 @@ static void __exit br_deinit(void)
unregister_netdevice_notifier(&br_device_notifier); unregister_netdevice_notifier(&br_device_notifier);
brioctl_set(NULL); brioctl_set(NULL);
br_cleanup_bridges(); unregister_pernet_subsys(&br_net_ops);
synchronize_net(); synchronize_net();

4
net/bridge/br_if.c
View File

@@ -446,13 +446,13 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
return 0; return 0;
} }
void __exit br_cleanup_bridges(void) void br_net_exit(struct net *net)
{ {
struct net_device *dev; struct net_device *dev;
rtnl_lock(); rtnl_lock();
restart: restart:
for_each_netdev(&init_net, dev) { for_each_netdev(net, dev) {
if (dev->priv_flags & IFF_EBRIDGE) { if (dev->priv_flags & IFF_EBRIDGE) {
del_br(dev->priv); del_br(dev->priv);
goto restart; goto restart;

2
net/bridge/br_private.h
View File

@@ -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 void br_port_carrier_check(struct net_bridge_port *p);
extern int br_add_bridge(struct net *net, const char *name); extern int br_add_bridge(struct net *net, const char *name);
extern int br_del_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, extern int br_add_if(struct net_bridge *br,
struct net_device *dev); struct net_device *dev);
extern int br_del_if(struct net_bridge *br, extern int br_del_if(struct net_bridge *br,