Browse Source

bridge: netlink: export root path cost

Add IFLA_BR_ROOT_PATH_COST and export it via netlink.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Nikolay Aleksandrov 10 years ago
parent
commit
684dd248be
2 changed files with 4 additions and 1 deletions
  1. 1 0
      include/uapi/linux/if_link.h
  2. 3 1
      net/bridge/br_netlink.c

+ 1 - 0
include/uapi/linux/if_link.h

@@ -236,6 +236,7 @@ enum {
 	IFLA_BR_ROOT_ID,
 	IFLA_BR_ROOT_ID,
 	IFLA_BR_BRIDGE_ID,
 	IFLA_BR_BRIDGE_ID,
 	IFLA_BR_ROOT_PORT,
 	IFLA_BR_ROOT_PORT,
+	IFLA_BR_ROOT_PATH_COST,
 	__IFLA_BR_MAX,
 	__IFLA_BR_MAX,
 };
 };
 
 

+ 3 - 1
net/bridge/br_netlink.c

@@ -857,6 +857,7 @@ static size_t br_get_size(const struct net_device *brdev)
 	       nla_total_size(sizeof(struct ifla_bridge_id)) +   /* IFLA_BR_ROOT_ID */
 	       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(struct ifla_bridge_id)) +   /* IFLA_BR_BRIDGE_ID */
 	       nla_total_size(sizeof(u16)) +    /* IFLA_BR_ROOT_PORT */
 	       nla_total_size(sizeof(u16)) +    /* IFLA_BR_ROOT_PORT */
+	       nla_total_size(sizeof(u32)) +    /* IFLA_BR_ROOT_PATH_COST */
 	       0;
 	       0;
 }
 }
 
 
@@ -890,7 +891,8 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
 	    nla_put_u16(skb, IFLA_BR_GROUP_FWD_MASK, group_fwd_mask) ||
 	    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(skb, IFLA_BR_BRIDGE_ID, sizeof(bridge_id), &bridge_id) ||
-	    nla_put_u16(skb, IFLA_BR_ROOT_PORT, br->root_port))
+	    nla_put_u16(skb, IFLA_BR_ROOT_PORT, br->root_port) ||
+	    nla_put_u32(skb, IFLA_BR_ROOT_PATH_COST, br->root_path_cost))
 		return -EMSGSIZE;
 		return -EMSGSIZE;
 
 
 #ifdef CONFIG_BRIDGE_VLAN_FILTERING
 #ifdef CONFIG_BRIDGE_VLAN_FILTERING