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

Commit 0fff0608 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bonding: convert use_carrier to use the new option API 



This patch adds the necessary changes so use_carrier 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 388d3a6d

drivers/net/bonding/bond_netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ static int bond_changelink(struct net_device *bond_dev, 
	if (data[IFLA_BOND_USE_CARRIER]) {

		int use_carrier = nla_get_u8(data[IFLA_BOND_USE_CARRIER]);



		err = bond_option_use_carrier_set(bond, use_carrier);

		bond_opt_initval(&newval, use_carrier);

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

		if (err)

			return err;

	}

drivers/net/bonding/bond_options.c

+18 −9
Original line number Diff line number Diff line
@@ -99,6 +99,12 @@ static struct bond_opt_value bond_primary_reselect_tbl[] = { 
	{ NULL,      -1},

};



static struct bond_opt_value bond_use_carrier_tbl[] = {

	{ "off", 0,  0},

	{ "on",  1,  BOND_VALFLAG_DEFAULT},

	{ NULL,  -1, 0}

};



static struct bond_option bond_opts[] = {

	[BOND_OPT_MODE] = {

		.id = BOND_OPT_MODE,
@@ -231,6 +237,13 @@ static struct bond_option bond_opts[] = { 
		.values = bond_primary_reselect_tbl,

		.set = bond_option_primary_reselect_set

	},

	[BOND_OPT_USE_CARRIER] = {

		.id = BOND_OPT_USE_CARRIER,

		.name = "use_carrier",

		.desc = "Use netif_carrier_ok (vs MII ioctls) in miimon",

		.values = bond_use_carrier_tbl,

		.set = bond_option_use_carrier_set

	},

	{ }

};
@@ -688,16 +701,12 @@ int bond_option_downdelay_set(struct bonding *bond, 
	return 0;

}



int bond_option_use_carrier_set(struct bonding *bond, int use_carrier)

int bond_option_use_carrier_set(struct bonding *bond,

				struct bond_opt_value *newval)

{

	if ((use_carrier == 0) || (use_carrier == 1)) {

		bond->params.use_carrier = use_carrier;

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

			bond->dev->name, use_carrier);

	} else {

		pr_info("%s: Ignoring invalid use_carrier value %d.\n",

			bond->dev->name, use_carrier);

	}

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

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

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



	return 0;

}

drivers/net/bonding/bond_options.h

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ enum { 
	BOND_OPT_MIIMON,

	BOND_OPT_PRIMARY,

	BOND_OPT_PRIMARY_RESELECT,

	BOND_OPT_USE_CARRIER,

	BOND_OPT_LAST

};
@@ -147,4 +148,6 @@ int bond_option_primary_set(struct bonding *bond, 
			    struct bond_opt_value *newval);

int bond_option_primary_reselect_set(struct bonding *bond,

				     struct bond_opt_value *newval);

int bond_option_use_carrier_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
@@ -772,23 +772,13 @@ static ssize_t bonding_store_carrier(struct device *d, 
				     struct device_attribute *attr,

				     const char *buf, size_t count)

{

	int new_value, ret;

	struct bonding *bond = to_bond(d);

	int ret;



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

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

		       bond->dev->name);

		return -EINVAL;

	}



	if (!rtnl_trylock())

		return restart_syscall();



	ret = bond_option_use_carrier_set(bond, new_value);

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

	if (!ret)

		ret = count;



	rtnl_unlock();

	return ret;

}

static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR,

drivers/net/bonding/bonding.h

+0 −1
Original line number Diff line number Diff line
@@ -453,7 +453,6 @@ unsigned int bond_get_num_tx_queues(void); 
int bond_netlink_init(void);

void bond_netlink_fini(void);

int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_dev);

int bond_option_use_carrier_set(struct bonding *bond, int use_carrier);

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