Commit 80df9a26 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bridge: netlink: export port's bridge id 



Add IFLA_BRPORT_BRIDGE_ID to allow getting the designated bridge id via
netlink.

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

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ enum { 
	IFLA_BRPORT_LEARNING_SYNC, /* mac learning sync from device */

	IFLA_BRPORT_PROXYARP_WIFI, /* proxy ARP for Wi-Fi */

	IFLA_BRPORT_ROOT_ID,	/* designated root */

	IFLA_BRPORT_BRIDGE_ID,	/* designated bridge */

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_netlink.c

+4 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ static inline size_t br_port_info_size(void) 
		+ nla_total_size(1)	/* IFLA_BRPORT_PROXYARP */

		+ nla_total_size(1)	/* IFLA_BRPORT_PROXYARP_WIFI */

		+ nla_total_size(sizeof(struct ifla_bridge_id))	/* IFLA_BRPORT_ROOT_ID */

		+ nla_total_size(sizeof(struct ifla_bridge_id))	/* IFLA_BRPORT_BRIDGE_ID */

		+ 0;

}
@@ -163,7 +164,9 @@ static int br_port_fill_attrs(struct sk_buff *skb, 
	    nla_put_u8(skb, IFLA_BRPORT_PROXYARP_WIFI,

		       !!(p->flags & BR_PROXYARP_WIFI)) ||

	    nla_put(skb, IFLA_BRPORT_ROOT_ID, sizeof(struct ifla_bridge_id),

		    &p->designated_root))

		    &p->designated_root) ||

	    nla_put(skb, IFLA_BRPORT_BRIDGE_ID, sizeof(struct ifla_bridge_id),

		    &p->designated_bridge))

		return -EMSGSIZE;



	return 0;