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

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

bridge: netlink: export port's timer values 



Add the following attributes in order to export port's timer values:
IFLA_BRPORT_MESSAGE_AGE_TIMER, IFLA_BRPORT_FORWARD_DELAY_TIMER and
IFLA_BRPORT_HOLD_TIMER.

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

include/uapi/linux/if_link.h

+3 −0
Original line number Diff line number Diff line
@@ -300,6 +300,9 @@ enum { 
	IFLA_BRPORT_NO,

	IFLA_BRPORT_TOPOLOGY_CHANGE_ACK,

	IFLA_BRPORT_CONFIG_PENDING,

	IFLA_BRPORT_MESSAGE_AGE_TIMER,

	IFLA_BRPORT_FORWARD_DELAY_TIMER,

	IFLA_BRPORT_HOLD_TIMER,

	__IFLA_BRPORT_MAX

};

#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

net/bridge/br_netlink.c

+14 −0
Original line number Diff line number Diff line
@@ -135,6 +135,9 @@ static inline size_t br_port_info_size(void) 
		+ 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 */

		+ nla_total_size(sizeof(u64))	/* IFLA_BRPORT_MESSAGE_AGE_TIMER */

		+ nla_total_size(sizeof(u64))	/* IFLA_BRPORT_FORWARD_DELAY_TIMER */

		+ nla_total_size(sizeof(u64))	/* IFLA_BRPORT_HOLD_TIMER */

		+ 0;

}
@@ -156,6 +159,7 @@ static int br_port_fill_attrs(struct sk_buff *skb, 
			      const struct net_bridge_port *p)

{

	u8 mode = !!(p->flags & BR_HAIRPIN_MODE);

	u64 timerval;



	if (nla_put_u8(skb, IFLA_BRPORT_STATE, p->state) ||

	    nla_put_u16(skb, IFLA_BRPORT_PRIORITY, p->priority) ||
@@ -182,6 +186,16 @@ static int br_port_fill_attrs(struct sk_buff *skb, 
	    nla_put_u8(skb, IFLA_BRPORT_CONFIG_PENDING, p->config_pending))

		return -EMSGSIZE;



	timerval = br_timer_value(&p->message_age_timer);

	if (nla_put_u64(skb, IFLA_BRPORT_MESSAGE_AGE_TIMER, timerval))

		return -EMSGSIZE;

	timerval = br_timer_value(&p->forward_delay_timer);

	if (nla_put_u64(skb, IFLA_BRPORT_FORWARD_DELAY_TIMER, timerval))

		return -EMSGSIZE;

	timerval = br_timer_value(&p->hold_timer);

	if (nla_put_u64(skb, IFLA_BRPORT_HOLD_TIMER, timerval))

		return -EMSGSIZE;



	return 0;

}