openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2) 

This ensures that bridges created with brctl(8) or ioctl(2) directly
also carry IFLA_LINKINFO when dumped over netlink. This also allows
to create a bridge with ioctl(2) and delete it with RTM_DELLINK.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2012-06-26 05:48:45 +00:00 committed by David S. Miller
parent d7ffde35e3
commit 149ddd83a9
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/bridge/br_if.c
View File

@ -240,6 +240,7 @@ int br_add_bridge(struct net *net, const char *name)
return -ENOMEM; return -ENOMEM;
dev_net_set(dev, net); dev_net_set(dev, net);
dev->rtnl_link_ops = &br_link_ops;
res = register_netdev(dev); res = register_netdev(dev);
if (res) if (res)

2
net/bridge/br_netlink.c
View File

@ -208,7 +208,7 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[])
return 0; return 0;
} }
static struct rtnl_link_ops br_link_ops __read_mostly = { struct rtnl_link_ops br_link_ops __read_mostly = {
.kind = "bridge", .kind = "bridge",
.priv_size = sizeof(struct net_bridge), .priv_size = sizeof(struct net_bridge),
.setup = br_dev_setup, .setup = br_dev_setup,

1
net/bridge/br_private.h
View File

@ -549,6 +549,7 @@ extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr)
#endif #endif
/* br_netlink.c */ /* br_netlink.c */
extern struct rtnl_link_ops br_link_ops;
extern int br_netlink_init(void); extern int br_netlink_init(void);
extern void br_netlink_fini(void); extern void br_netlink_fini(void);
extern void br_ifinfo_notify(int event, struct net_bridge_port *port); extern void br_ifinfo_notify(int event, struct net_bridge_port *port);