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

Commit cadfaf43 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bond-netlink-3ad-attrs' 



Nikolay Aleksandrov says:

====================
bonding: extend the 3ad exported attributes

These are two small patches that export actor_oper_port_state and
partner_oper_port_state via netlink and sysfs, until now they were only
exported via bond's proc entry. If this set gets accepted I have an iproute2
patch prepared that will export them with which I tested these changes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4d367963 46ea297e

drivers/net/bonding/bond_netlink.c

+14 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ static size_t bond_get_slave_size(const struct net_device *bond_dev, 
		nla_total_size(MAX_ADDR_LEN) +	/* IFLA_BOND_SLAVE_PERM_HWADDR */

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

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

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

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

		0;

}
@@ -56,12 +58,23 @@ static int bond_fill_slave_info(struct sk_buff *skb, 


	if (BOND_MODE(slave->bond) == BOND_MODE_8023AD) {

		const struct aggregator *agg;

		const struct port *ad_port;



		ad_port = &SLAVE_AD_INFO(slave)->port;

		agg = SLAVE_AD_INFO(slave)->port.aggregator;

		if (agg)

		if (agg) {

			if (nla_put_u16(skb, IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,

					agg->aggregator_identifier))

				goto nla_put_failure;

			if (nla_put_u8(skb,

				       IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,

				       ad_port->actor_oper_port_state))

				goto nla_put_failure;

			if (nla_put_u16(skb,

					IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,

					ad_port->partner_oper.port_state))

				goto nla_put_failure;

		}

	}



	return 0;

drivers/net/bonding/bond_sysfs_slave.c

+32 −0
Original line number Diff line number Diff line
@@ -80,6 +80,36 @@ static ssize_t ad_aggregator_id_show(struct slave *slave, char *buf) 
}

static SLAVE_ATTR_RO(ad_aggregator_id);



static ssize_t ad_actor_oper_port_state_show(struct slave *slave, char *buf)

{

	const struct port *ad_port;



	if (BOND_MODE(slave->bond) == BOND_MODE_8023AD) {

		ad_port = &SLAVE_AD_INFO(slave)->port;

		if (ad_port->aggregator)

			return sprintf(buf, "%u\n",

				       ad_port->actor_oper_port_state);

	}



	return sprintf(buf, "N/A\n");

}

static SLAVE_ATTR_RO(ad_actor_oper_port_state);



static ssize_t ad_partner_oper_port_state_show(struct slave *slave, char *buf)

{

	const struct port *ad_port;



	if (BOND_MODE(slave->bond) == BOND_MODE_8023AD) {

		ad_port = &SLAVE_AD_INFO(slave)->port;

		if (ad_port->aggregator)

			return sprintf(buf, "%u\n",

				       ad_port->partner_oper.port_state);

	}



	return sprintf(buf, "N/A\n");

}

static SLAVE_ATTR_RO(ad_partner_oper_port_state);



static const struct slave_attribute *slave_attrs[] = {

	&slave_attr_state,

	&slave_attr_mii_status,
@@ -87,6 +117,8 @@ static const struct slave_attribute *slave_attrs[] = { 
	&slave_attr_perm_hwaddr,

	&slave_attr_queue_id,

	&slave_attr_ad_aggregator_id,

	&slave_attr_ad_actor_oper_port_state,

	&slave_attr_ad_partner_oper_port_state,

	NULL

};

include/uapi/linux/if_link.h

+2 −0
Original line number Diff line number Diff line
@@ -456,6 +456,8 @@ enum { 
	IFLA_BOND_SLAVE_PERM_HWADDR,

	IFLA_BOND_SLAVE_QUEUE_ID,

	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,

	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,

	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE,

	__IFLA_BOND_SLAVE_MAX,

};