Commit 3d98ee52 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by Paolo Abeni
Browse files

net: bonding: add broadcast_neighbor netlink option 



User can config or display the bonding broadcast_neighbor option via
iproute2/netlink.

Cc: Jay Vosburgh <jv@jvosburgh.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Simon Horman <horms@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarTonghao Zhang <tonghao@bamaicloud.com>
Signed-off-by: default avatarZengbing Tu <tuzengbing@didiglobal.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/76b90700ba5b98027dfb51a2f3c5cfea0440a21b.1751031306.git.tonghao@bamaicloud.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent ce7a3816

drivers/net/bonding/bond_netlink.c

+16 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[IFLA_BOND_MISSED_MAX]		= { .type = NLA_U8 },

	[IFLA_BOND_NS_IP6_TARGET]	= { .type = NLA_NESTED },

	[IFLA_BOND_COUPLED_CONTROL]	= { .type = NLA_U8 },

	[IFLA_BOND_BROADCAST_NEIGH]	= { .type = NLA_U8 },

};



static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = {
@@ -561,6 +562,16 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], 
			return err;

	}



	if (data[IFLA_BOND_BROADCAST_NEIGH]) {

		int broadcast_neigh = nla_get_u8(data[IFLA_BOND_BROADCAST_NEIGH]);



		bond_opt_initval(&newval, broadcast_neigh);

		err = __bond_opt_set(bond, BOND_OPT_BROADCAST_NEIGH, &newval,

				     data[IFLA_BOND_BROADCAST_NEIGH], extack);

		if (err)

			return err;

	}



	return 0;

}
@@ -630,6 +641,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		nla_total_size(sizeof(struct nlattr)) +

		nla_total_size(sizeof(struct in6_addr)) * BOND_MAX_NS_TARGETS +

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

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

		0;

}
@@ -793,6 +805,10 @@ static int bond_fill_info(struct sk_buff *skb, 
		       bond->params.coupled_control))

		goto nla_put_failure;



	if (nla_put_u8(skb, IFLA_BOND_BROADCAST_NEIGH,

		       bond->params.broadcast_neighbor))

		goto nla_put_failure;



	if (BOND_MODE(bond) == BOND_MODE_8023AD) {

		struct ad_info info;

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -1535,6 +1535,7 @@ enum { 
	IFLA_BOND_MISSED_MAX,

	IFLA_BOND_NS_IP6_TARGET,

	IFLA_BOND_COUPLED_CONTROL,

	IFLA_BOND_BROADCAST_NEIGH,

	__IFLA_BOND_MAX,

};