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

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

bonding: add resend_igmp attribute netlink support 



Add IFLA_BOND_RESEND_IGMP to allow get/set of bonding parameter
resend_igmp via netlink.

Signed-off-by: default avatarScott Feldman <sfeldma@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f70161c6

drivers/net/bonding/bond_netlink.c

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

	[IFLA_BOND_FAIL_OVER_MAC]	= { .type = NLA_U8 },

	[IFLA_BOND_XMIT_HASH_POLICY]	= { .type = NLA_U8 },

	[IFLA_BOND_RESEND_IGMP]		= { .type = NLA_U32 },

};



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

			return err;

	}

	if (data[IFLA_BOND_RESEND_IGMP]) {

		int resend_igmp =

			nla_get_u32(data[IFLA_BOND_RESEND_IGMP]);



		err = bond_option_resend_igmp_set(bond, resend_igmp);

		if (err)

			return err;

	}

	return 0;

}
@@ -227,6 +236,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_PRIMARY_RESELECT */

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

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

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

		0;

}
@@ -303,6 +313,10 @@ static int bond_fill_info(struct sk_buff *skb, 
		       bond->params.xmit_policy))

		goto nla_put_failure;



	if (nla_put_u32(skb, IFLA_BOND_RESEND_IGMP,

		        bond->params.resend_igmp))

		goto nla_put_failure;



	return 0;



nla_put_failure:

drivers/net/bonding/bond_options.c

+15 −0
Original line number Diff line number Diff line
@@ -561,3 +561,18 @@ int bond_option_xmit_hash_policy_set(struct bonding *bond, int xmit_hash_policy) 


	return 0;

}



int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp)

{

	if (resend_igmp < 0 || resend_igmp > 255) {

		pr_err("%s: Invalid resend_igmp value %d not in range 0-255; rejected.\n",

		       bond->dev->name, resend_igmp);

		return -EINVAL;

	}



	bond->params.resend_igmp = resend_igmp;

	pr_info("%s: Setting resend_igmp to %d.\n",

		bond->dev->name, resend_igmp);



	return 0;

}

drivers/net/bonding/bond_sysfs.c

+8 −12
Original line number Diff line number Diff line
@@ -1336,21 +1336,17 @@ static ssize_t bonding_store_resend_igmp(struct device *d, 
	if (sscanf(buf, "%d", &new_value) != 1) {

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

		       bond->dev->name);

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}



	if (new_value < 0 || new_value > 255) {

		pr_err("%s: Invalid resend_igmp value %d not in range 0-255; rejected.\n",

		       bond->dev->name, new_value);

		ret = -EINVAL;

		goto out;

	}

	if (!rtnl_trylock())

		return restart_syscall();



	pr_info("%s: Setting resend_igmp to %d.\n",

		bond->dev->name, new_value);

	bond->params.resend_igmp = new_value;

out:

	ret = bond_option_resend_igmp_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
@@ -460,6 +460,7 @@ int bond_option_primary_reselect_set(struct bonding *bond, 
int bond_option_fail_over_mac_set(struct bonding *bond, int fail_over_mac);

int bond_option_xmit_hash_policy_set(struct bonding *bond,

				     int xmit_hash_policy);

int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp);

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
@@ -343,6 +343,7 @@ enum { 
	IFLA_BOND_PRIMARY_RESELECT,

	IFLA_BOND_FAIL_OVER_MAC,

	IFLA_BOND_XMIT_HASH_POLICY,

	IFLA_BOND_RESEND_IGMP,

	__IFLA_BOND_MAX,

};