Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7599a220 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bridge: netlink: export bridge id 



Add IFLA_BR_BRIDGE_ID and export br->bridge_id via netlink.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5127c81f

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ enum { 
	IFLA_BR_VLAN_PROTOCOL,

	IFLA_BR_GROUP_FWD_MASK,

	IFLA_BR_ROOT_ID,

	IFLA_BR_BRIDGE_ID,

	__IFLA_BR_MAX,

};

net/bridge/br_netlink.c

+7 −2
Original line number Diff line number Diff line
@@ -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