[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.23 / 0040-bridge-Assign-rtnl_link_ops-to-bridge-devices-create.patch
1 From e310ae5ff49ec77b2c991cffe288ac766e5f5203 Mon Sep 17 00:00:00 2001
2 From: stephen hemminger <shemminger@vyatta.com>
3 Date: Tue, 26 Jun 2012 05:48:45 +0000
4 Subject: [PATCH 40/49] bridge: Assign rtnl_link_ops to bridge devices created
5 via ioctl (v2)
7 [ Upstream commit 149ddd83a92b02c658d6c61f3276eb6500d585e8 ]
9 This ensures that bridges created with brctl(8) or ioctl(2) directly
10 also carry IFLA_LINKINFO when dumped over netlink. This also allows
11 to create a bridge with ioctl(2) and delete it with RTM_DELLINK.
13 Signed-off-by: Thomas Graf <tgraf@suug.ch>
14 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
15 Signed-off-by: David S. Miller <davem@davemloft.net>
16 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
17 ---
18 net/bridge/br_if.c | 1 +
19 net/bridge/br_netlink.c | 2 +-
20 net/bridge/br_private.h | 1 +
21 3 files changed, 3 insertions(+), 1 deletion(-)
23 diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
24 index f603e5b..f3f75ad 100644
25 --- a/net/bridge/br_if.c
26 +++ b/net/bridge/br_if.c
27 @@ -240,6 +240,7 @@ int br_add_bridge(struct net *net, const char *name)
28 return -ENOMEM;
30 dev_net_set(dev, net);
31 + dev->rtnl_link_ops = &br_link_ops;
33 res = register_netdev(dev);
34 if (res)
35 diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
36 index a1daf82..cbf9ccd 100644
37 --- a/net/bridge/br_netlink.c
38 +++ b/net/bridge/br_netlink.c
39 @@ -211,7 +211,7 @@ static int br_validate(struct nlattr *tb[], struct nlattr *data[])
40 return 0;
41 }
43 -static struct rtnl_link_ops br_link_ops __read_mostly = {
44 +struct rtnl_link_ops br_link_ops __read_mostly = {
45 .kind = "bridge",
46 .priv_size = sizeof(struct net_bridge),
47 .setup = br_dev_setup,
48 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
49 index 93264df..b9bba8f 100644
50 --- a/net/bridge/br_private.h
51 +++ b/net/bridge/br_private.h
52 @@ -536,6 +536,7 @@ extern int (*br_fdb_test_addr_hook)(struct net_device *dev, unsigned char *addr)
53 #endif
55 /* br_netlink.c */
56 +extern struct rtnl_link_ops br_link_ops;
57 extern int br_netlink_init(void);
58 extern void br_netlink_fini(void);
59 extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
60 --
61 1.7.10