From 571339148afe501f72c1b500038fd7750d1276c3 Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Tue, 26 Jun 2012 05:48:45 +0000
Subject: [PATCH] --- yaml --- r: 311431 b: refs/heads/master c:
 149ddd83a92b02c658d6c61f3276eb6500d585e8 h: refs/heads/master i:   311429:
 b8bc4117c714a26a836a79294c86d485f21a75f2   311427:
 cd6c132152632a509e1e6206ac454aa6d56e145b   311423:
 986f016606060b67f6c62073f0b52137ff8c566a v: v3

---
 [refs]                        | 2 +-
 trunk/net/bridge/br_if.c      | 1 +
 trunk/net/bridge/br_netlink.c | 2 +-
 trunk/net/bridge/br_private.h | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cf264faf28ed..3aeb9a0dcfbc 100644
--- 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
index 0a942fbccc9a..e1144e1617be 100644
--- 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
index 2080485515f1..fe41260fbf38 100644
--- 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
index 1a8ad4fb9a6b..a768b2408edf 100644
--- 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);