diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-09-09 01:19:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-09 01:19:58 +0200 |
| commit | 4aa678ba44aa35759c04f300afbc97d3dab5faa2 (patch) | |
| tree | fc4a2e01cde902913594b00461ea7e021fc223c4 /net/bridge/br_private.h | |
| parent | warn: Turn the netdev timeout WARN_ON() into a WARN() (diff) | |
| download | linux-4aa678ba44aa35759c04f300afbc97d3dab5faa2.tar.xz linux-4aa678ba44aa35759c04f300afbc97d3dab5faa2.zip | |
netns bridge: allow bridges in netns!
Bridge as netdevice doesn't cross netns boundaries.
Bridge ports and bridge itself live in same netns.
Notifiers are fixed.
netns propagated from userspace socket for setup and teardown.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Stephen Hemminger <shemming@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index c3dc18ddc043..51eaeaaa58c0 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -178,8 +178,8 @@ extern void br_flood_forward(struct net_bridge *br, struct sk_buff *skb); /* br_if.c */ extern void br_port_carrier_check(struct net_bridge_port *p); -extern int br_add_bridge(const char *name); -extern int br_del_bridge(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 void br_cleanup_bridges(void); extern int br_add_if(struct net_bridge *br, struct net_device *dev); |