bridge: netlink: export topology_change and topology_change_detected

[deliverable/linux.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 7a3692469db6b3733efee1e43003acf8357242f2..8bcaa5171f351700183cf36ad50f88c62c99657d 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -855,6 +855,11 @@ 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 */
+              nla_total_size(sizeof(u16)) +    /* IFLA_BR_ROOT_PORT */
+              nla_total_size(sizeof(u32)) +    /* IFLA_BR_ROOT_PATH_COST */
+              nla_total_size(sizeof(u8)) +    /* IFLA_BR_TOPOLOGY_CHANGE */
+              nla_total_size(sizeof(u8)) +    /* IFLA_BR_TOPOLOGY_CHANGE_DETECTED */
               0;
 }
 
@@ -869,11 +874,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 +891,13 @@ 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) ||
+           nla_put_u16(skb, IFLA_BR_ROOT_PORT, br->root_port) ||
+           nla_put_u32(skb, IFLA_BR_ROOT_PATH_COST, br->root_path_cost) ||
+           nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE, br->topology_change) ||
+           nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE_DETECTED,
+                      br->topology_change_detected))
                return -EMSGSIZE;
 
 #ifdef CONFIG_BRIDGE_VLAN_FILTERING