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

Commit 8d836d09 authored by sfeldma@cumulusnetworks.com's avatar sfeldma@cumulusnetworks.com Committed by David S. Miller
Browse files

bonding: add lp_interval attribute netlink support 



Add IFLA_BOND_LP_INTERVAL to allow get/set of bonding parameter
lp_interval via netlink.

Signed-off-by: default avatarScott Feldman <sfeldma@cumulusnetworks.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d101008

drivers/net/bonding/bond_netlink.c

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

	[IFLA_BOND_ALL_SLAVES_ACTIVE]	= { .type = NLA_U8 },

	[IFLA_BOND_MIN_LINKS]		= { .type = NLA_U32 },

	[IFLA_BOND_LP_INTERVAL]		= { .type = NLA_U32 },

};



static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -232,6 +233,14 @@ static int bond_changelink(struct net_device *bond_dev, 
		if (err)

			return err;

	}

	if (data[IFLA_BOND_LP_INTERVAL]) {

		int lp_interval =

			nla_get_u32(data[IFLA_BOND_LP_INTERVAL]);



		err = bond_option_lp_interval_set(bond, lp_interval);

		if (err)

			return err;

	}

	return 0;

}
@@ -268,6 +277,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_NUM_PEER_NOTIF */

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

		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_MIN_LINKS */

		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_LP_INTERVAL */

		0;

}
@@ -360,6 +370,10 @@ static int bond_fill_info(struct sk_buff *skb, 
			bond->params.min_links))

		goto nla_put_failure;



	if (nla_put_u32(skb, IFLA_BOND_LP_INTERVAL,

			bond->params.lp_interval))

		goto nla_put_failure;



	return 0;



nla_put_failure:

drivers/net/bonding/bond_options.c

+13 −0
Original line number Diff line number Diff line
@@ -620,3 +620,16 @@ int bond_option_min_links_set(struct bonding *bond, int min_links) 


	return 0;

}



int bond_option_lp_interval_set(struct bonding *bond, int lp_interval)

{

	if (lp_interval <= 0) {

		pr_err("%s: lp_interval must be between 1 and %d\n",

		       bond->dev->name, INT_MAX);

		return -EINVAL;

	}



	bond->params.lp_interval = lp_interval;



	return 0;

}

drivers/net/bonding/bond_sysfs.c

+9 −11
Original line number Diff line number Diff line
@@ -1369,24 +1369,22 @@ static ssize_t bonding_store_lp_interval(struct device *d, 
					 const char *buf, size_t count)

{

	struct bonding *bond = to_bond(d);

	int new_value, ret = count;

	int new_value, ret;



	if (sscanf(buf, "%d", &new_value) != 1) {

		pr_err("%s: no lp interval value specified.\n",

			bond->dev->name);

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	if (new_value <= 0) {

		pr_err ("%s: lp_interval must be between 1 and %d\n",

			bond->dev->name, INT_MAX);

		ret = -EINVAL;

		goto out;

	}

	if (!rtnl_trylock())

		return restart_syscall();



	bond->params.lp_interval = new_value;

out:

	ret = bond_option_lp_interval_set(bond, new_value);

	if (!ret)

		ret = count;



	rtnl_unlock();

	return ret;

}

drivers/net/bonding/bonding.h

+1 −0
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ int bond_option_num_peer_notif_set(struct bonding *bond, int num_peer_notif); 
int bond_option_all_slaves_active_set(struct bonding *bond,

				      int all_slaves_active);

int bond_option_min_links_set(struct bonding *bond, int min_links);

int bond_option_lp_interval_set(struct bonding *bond, int min_links);

struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);

struct net_device *bond_option_active_slave_get(struct bonding *bond);

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ enum { 
	IFLA_BOND_NUM_PEER_NOTIF,

	IFLA_BOND_ALL_SLAVES_ACTIVE,

	IFLA_BOND_MIN_LINKS,

	IFLA_BOND_LP_INTERVAL,

	__IFLA_BOND_MAX,

};