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

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

bridge: netlink: export port's topology_change_ack and config_pending 



Add IFLA_BRPORT_TOPOLOGY_CHANGE_ACK and IFLA_BRPORT_CONFIG_PENDING to
allow getting port's topology_change_ack and config_pending respectively
via netlink.

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

include/uapi/linux/if_link.h

+2 −0
Original line number Diff line number Diff line
@@ -298,6 +298,8 @@ enum { 
	IFLA_BRPORT_DESIGNATED_COST,

	IFLA_BRPORT_ID,

	IFLA_BRPORT_NO,

	IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,

	IFLA_BRPORT_CONFIG_PENDING,

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_netlink.c

+6 −1
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ static inline size_t br_port_info_size(void) 
		+ nla_total_size(sizeof(u16))	/* IFLA_BRPORT_DESIGNATED_COST */

		+ nla_total_size(sizeof(u16))	/* IFLA_BRPORT_ID */

		+ nla_total_size(sizeof(u16))	/* IFLA_BRPORT_NO */

		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_TOPOLOGY_CHANGE_ACK */

		+ nla_total_size(sizeof(u8))	/* IFLA_BRPORT_CONFIG_PENDING */

		+ 0;

}
@@ -174,7 +176,10 @@ static int br_port_fill_attrs(struct sk_buff *skb, 
	    nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_PORT, p->designated_port) ||

	    nla_put_u16(skb, IFLA_BRPORT_DESIGNATED_COST, p->designated_cost) ||

	    nla_put_u16(skb, IFLA_BRPORT_ID, p->port_id) ||

	    nla_put_u16(skb, IFLA_BRPORT_NO, p->port_no))

	    nla_put_u16(skb, IFLA_BRPORT_NO, p->port_no) ||

	    nla_put_u8(skb, IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,

		       p->topology_change_ack) ||

	    nla_put_u8(skb, IFLA_BRPORT_CONFIG_PENDING, p->config_pending))

		return -EMSGSIZE;



	return 0;