summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>2015-10-04 14:23:30 +0200
committerDavid S. Miller <davem@davemloft.net>2015-10-04 16:45:55 -0700
commit7599a2201fc71cdca16a92d350f14cce8730e03f (patch)
tree1780d452e2fdbbb4160e066f37649b263e3bd9a2 /net/bridge
parent5127c81f84de0dd643d5840a2c7de571bc6aceb3 (diff)
bridge: netlink: export bridge id
Add IFLA_BR_BRIDGE_ID and export br->bridge_id via netlink. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netlink.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 7a3692469db6..a63f944a7f12 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -855,6 +855,7 @@ static size_t br_get_size(const struct net_device *brdev)
#endif
nla_total_size(sizeof(u16)) + /* IFLA_BR_GROUP_FWD_MASK */
nla_total_size(sizeof(struct ifla_bridge_id)) + /* IFLA_BR_ROOT_ID */
+ nla_total_size(sizeof(struct ifla_bridge_id)) + /* IFLA_BR_BRIDGE_ID */
0;
}
@@ -869,11 +870,14 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
u16 priority = (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1];
u16 group_fwd_mask = br->group_fwd_mask;
u8 vlan_enabled = br_vlan_enabled(br);
- struct ifla_bridge_id root_id;
+ struct ifla_bridge_id root_id, bridge_id;
+ memset(&bridge_id, 0, sizeof(bridge_id));
memset(&root_id, 0, sizeof(root_id));
memcpy(root_id.prio, br->designated_root.prio, sizeof(root_id.prio));
memcpy(root_id.addr, br->designated_root.addr, sizeof(root_id.addr));
+ memcpy(bridge_id.prio, br->bridge_id.prio, sizeof(bridge_id.prio));
+ memcpy(bridge_id.addr, br->bridge_id.addr, sizeof(bridge_id.addr));
if (nla_put_u32(skb, IFLA_BR_FORWARD_DELAY, forward_delay) ||
nla_put_u32(skb, IFLA_BR_HELLO_TIME, hello_time) ||
@@ -883,7 +887,8 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
nla_put_u16(skb, IFLA_BR_PRIORITY, priority) ||
nla_put_u8(skb, IFLA_BR_VLAN_FILTERING, vlan_enabled) ||
nla_put_u16(skb, IFLA_BR_GROUP_FWD_MASK, group_fwd_mask) ||
- nla_put(skb, IFLA_BR_ROOT_ID, sizeof(root_id), &root_id))
+ nla_put(skb, IFLA_BR_ROOT_ID, sizeof(root_id), &root_id) ||
+ nla_put(skb, IFLA_BR_BRIDGE_ID, sizeof(bridge_id), &bridge_id))
return -EMSGSIZE;
#ifdef CONFIG_BRIDGE_VLAN_FILTERING