---

yaml --- r: 311431 b: refs/heads/master c: 149ddd8 h: refs/heads/master i: 311429: b8bc411 311427: cd6c132 311423: 986f016 v: v3
git-mirror · Jun 27, 2012 · 5713391 · 5713391
1 parent df5c7df
commit 5713391
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7ffde35e31a81100d2d0d2c4013cbf527bb32ea
+refs/heads/master: 149ddd83a92b02c658d6c61f3276eb6500d585e8
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -240,6 +240,7 @@ int br_add_bridge(struct net *net, const char *name)
 		return -ENOMEM;
 
 	dev_net_set(dev, net);
+	dev->rtnl_link_ops = &br_link_ops;
 
 	res = register_netdev(dev);
 	if (res)

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

diff --git a/trunk/net/bridge/br_private.h b/trunk/net/bridge/br_private.h
@@ -549,6 +549,7 @@ extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr)
 #endif
 
 /* br_netlink.c */
+extern struct rtnl_link_ops br_link_ops;
 extern int br_netlink_init(void);
 extern void br_netlink_fini(void);
 extern void br_ifinfo_notify(int event, struct net_bridge_port *port);