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

Commit 105c8fb6 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bonding: convert resend_igmp to use the new option API 



This patch adds the necessary changes so resend_igmp would use
the new bonding option API.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3df01162

drivers/net/bonding/bond_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -265,7 +265,8 @@ static int bond_changelink(struct net_device *bond_dev, 
		int resend_igmp =

			nla_get_u32(data[IFLA_BOND_RESEND_IGMP]);



		err = bond_option_resend_igmp_set(bond, resend_igmp);

		bond_opt_initval(&newval, resend_igmp);

		err = __bond_opt_set(bond, BOND_OPT_RESEND_IGMP, &newval);

		if (err)

			return err;

	}

drivers/net/bonding/bond_options.c

+19 −10
Original line number Diff line number Diff line
@@ -111,6 +111,13 @@ static struct bond_opt_value bond_all_slaves_active_tbl[] = { 
	{ NULL,  -1, 0}

};



static struct bond_opt_value bond_resend_igmp_tbl[] = {

	{ "off",     0,   0},

	{ "maxval",  255, BOND_VALFLAG_MAX},

	{ "default", 1,   BOND_VALFLAG_DEFAULT},

	{ NULL,      -1,  0}

};



static struct bond_option bond_opts[] = {

	[BOND_OPT_MODE] = {

		.id = BOND_OPT_MODE,
@@ -274,6 +281,13 @@ static struct bond_option bond_opts[] = { 
		.values = bond_all_slaves_active_tbl,

		.set = bond_option_all_slaves_active_set

	},

	[BOND_OPT_RESEND_IGMP] = {

		.id = BOND_OPT_RESEND_IGMP,

		.name = "resend_igmp",

		.desc = "Number of IGMP membership reports to send on link failure",

		.values = bond_resend_igmp_tbl,

		.set = bond_option_resend_igmp_set

	},

	{ }

};
@@ -1038,17 +1052,12 @@ int bond_option_xmit_hash_policy_set(struct bonding *bond, 
	return 0;

}



int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp)

int bond_option_resend_igmp_set(struct bonding *bond,

				struct bond_opt_value *newval)

{

	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);

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

		bond->dev->name, newval->value);

	bond->params.resend_igmp = newval->value;



	return 0;

}

drivers/net/bonding/bond_options.h

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum { 
	BOND_OPT_ACTIVE_SLAVE,

	BOND_OPT_QUEUE_ID,

	BOND_OPT_ALL_SLAVES_ACTIVE,

	BOND_OPT_RESEND_IGMP,

	BOND_OPT_LAST

};
@@ -159,4 +160,6 @@ int bond_option_queue_id_set(struct bonding *bond, 
			     struct bond_opt_value *newval);

int bond_option_all_slaves_active_set(struct bonding *bond,

				      struct bond_opt_value *newval);

int bond_option_resend_igmp_set(struct bonding *bond,

				struct bond_opt_value *newval);

#endif /* _BOND_OPTIONS_H */

drivers/net/bonding/bond_sysfs.c

+2 −12
Original line number Diff line number Diff line
@@ -1043,23 +1043,13 @@ static ssize_t bonding_store_resend_igmp(struct device *d, 
					 struct device_attribute *attr,

					 const char *buf, size_t count)

{

	int new_value, ret = count;

	struct bonding *bond = to_bond(d);

	int ret;



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

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

		       bond->dev->name);

		return -EINVAL;

	}



	if (!rtnl_trylock())

		return restart_syscall();



	ret = bond_option_resend_igmp_set(bond, new_value);

	ret = bond_opt_tryset_rtnl(bond, BOND_OPT_RESEND_IGMP, (char *)buf);

	if (!ret)

		ret = count;



	rtnl_unlock();

	return ret;

}

drivers/net/bonding/bonding.h

+0 −1
Original line number Diff line number Diff line
@@ -454,7 +454,6 @@ int bond_netlink_init(void); 
void bond_netlink_fini(void);

int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);

int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);

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

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);