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

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

bonding: add min_links attribute netlink support 



Add IFLA_BOND_MIN_LINKS to allow get/set of bonding parameter
min_links 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 1cc0b1e3

drivers/net/bonding/bond_netlink.c

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

	[IFLA_BOND_NUM_PEER_NOTIF]	= { .type = NLA_U8 },

	[IFLA_BOND_ALL_SLAVES_ACTIVE]	= { .type = NLA_U8 },

	[IFLA_BOND_MIN_LINKS]		= { .type = NLA_U32 },

};



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

			return err;

	}

	if (data[IFLA_BOND_MIN_LINKS]) {

		int min_links =

			nla_get_u32(data[IFLA_BOND_MIN_LINKS]);



		err = bond_option_min_links_set(bond, min_links);

		if (err)

			return err;

	}

	return 0;

}
@@ -258,6 +267,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_RESEND_IGMP */

		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 */

		0;

}
@@ -346,6 +356,10 @@ static int bond_fill_info(struct sk_buff *skb, 
		       bond->params.all_slaves_active))

		goto nla_put_failure;



	if (nla_put_u32(skb, IFLA_BOND_MIN_LINKS,

			bond->params.min_links))

		goto nla_put_failure;



	return 0;



nla_put_failure:

drivers/net/bonding/bond_options.c

+9 −0
Original line number Diff line number Diff line
@@ -611,3 +611,12 @@ int bond_option_all_slaves_active_set(struct bonding *bond, 


	return 0;

}



int bond_option_min_links_set(struct bonding *bond, int min_links)

{

	pr_info("%s: Setting min links value to %u\n",

		bond->dev->name, min_links);

	bond->params.min_links = min_links;



	return 0;

}

drivers/net/bonding/bond_sysfs.c

+9 −4
Original line number Diff line number Diff line
@@ -722,10 +722,15 @@ static ssize_t bonding_store_min_links(struct device *d, 
		return ret;

	}



	pr_info("%s: Setting min links value to %u\n",

		bond->dev->name, new_value);

	bond->params.min_links = new_value;

	return count;

	if (!rtnl_trylock())

		return restart_syscall();



	ret = bond_option_min_links_set(bond, new_value);

	if (!ret)

		ret = count;



	rtnl_unlock();

	return ret;

}

static DEVICE_ATTR(min_links, S_IRUGO | S_IWUSR,

		   bonding_show_min_links, bonding_store_min_links);

drivers/net/bonding/bonding.h

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp); 
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);

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
@@ -346,6 +346,7 @@ enum { 
	IFLA_BOND_RESEND_IGMP,

	IFLA_BOND_NUM_PEER_NOTIF,

	IFLA_BOND_ALL_SLAVES_ACTIVE,

	IFLA_BOND_MIN_LINKS,

	__IFLA_BOND_MAX,

};