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

Commit 1df6b6aa authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bonding: convert fail_over_mac to use the new option API 



This patch adds the necessary changes so fail_over_mac would use
the new bonding option API. Also fixes a trivial copy/paste error in
bond_check_params where the wrong variable was used for the error msg.

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

drivers/net/bonding/bond_main.c

+6 −12
Original line number Diff line number Diff line
@@ -214,13 +214,6 @@ const struct bond_parm_tbl bond_lacp_tbl[] = { 
{	NULL,		-1},

};



const struct bond_parm_tbl fail_over_mac_tbl[] = {

{	"none",			BOND_FOM_NONE},

{	"active",		BOND_FOM_ACTIVE},

{	"follow",		BOND_FOM_FOLLOW},

{	NULL,			-1},

};



const struct bond_parm_tbl pri_reselect_tbl[] = {

{	"always",		BOND_PRI_RESELECT_ALWAYS},

{	"better",		BOND_PRI_RESELECT_BETTER},
@@ -4280,14 +4273,15 @@ static int bond_check_params(struct bond_params *params) 
	}



	if (fail_over_mac) {

		fail_over_mac_value = bond_parse_parm(fail_over_mac,

						      fail_over_mac_tbl);

		if (fail_over_mac_value == -1) {

		bond_opt_initstr(&newval, fail_over_mac);

		valptr = bond_opt_parse(bond_opt_get(BOND_OPT_FAIL_OVER_MAC),

					&newval);

		if (!valptr) {

			pr_err("Error: invalid fail_over_mac \"%s\"\n",

			       arp_validate == NULL ? "NULL" : arp_validate);

			       fail_over_mac);

			return -EINVAL;

		}



		fail_over_mac_value = valptr->value;

		if (bond_mode != BOND_MODE_ACTIVEBACKUP)

			pr_warning("Warning: fail_over_mac only affects active-backup mode.\n");

	} else {

drivers/net/bonding/bond_netlink.c

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

			nla_get_u8(data[IFLA_BOND_FAIL_OVER_MAC]);



		err = bond_option_fail_over_mac_set(bond, fail_over_mac);

		bond_opt_initval(&newval, fail_over_mac);

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

		if (err)

			return err;

	}

drivers/net/bonding/bond_options.c

+20 −17
Original line number Diff line number Diff line
@@ -59,6 +59,13 @@ static struct bond_opt_value bond_arp_all_targets_tbl[] = { 
	{ NULL,  -1,                   0},

};



static struct bond_opt_value bond_fail_over_mac_tbl[] = {

	{ "none",   BOND_FOM_NONE,   BOND_VALFLAG_DEFAULT},

	{ "active", BOND_FOM_ACTIVE, 0},

	{ "follow", BOND_FOM_FOLLOW, 0},

	{ NULL,     -1,              0},

};



static struct bond_option bond_opts[] = {

	[BOND_OPT_MODE] = {

		.id = BOND_OPT_MODE,
@@ -98,6 +105,14 @@ static struct bond_option bond_opts[] = { 
		.values = bond_arp_all_targets_tbl,

		.set = bond_option_arp_all_targets_set

	},

	[BOND_OPT_FAIL_OVER_MAC] = {

		.id = BOND_OPT_FAIL_OVER_MAC,

		.name = "fail_over_mac",

		.desc = "For active-backup, do not set all slaves to the same MAC",

		.flags = BOND_OPTFLAG_NOSLAVES,

		.values = bond_fail_over_mac_tbl,

		.set = bond_option_fail_over_mac_set

	},

	{ }

};
@@ -864,24 +879,12 @@ int bond_option_primary_reselect_set(struct bonding *bond, int primary_reselect) 
	return 0;

}



int bond_option_fail_over_mac_set(struct bonding *bond, int fail_over_mac)

int bond_option_fail_over_mac_set(struct bonding *bond,

				  struct bond_opt_value *newval)

{

	if (bond_parm_tbl_lookup(fail_over_mac, fail_over_mac_tbl) < 0) {

		pr_err("%s: Ignoring invalid fail_over_mac value %d.\n",

		       bond->dev->name, fail_over_mac);

		return -EINVAL;

	}



	if (bond_has_slaves(bond)) {

		pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",

		       bond->dev->name);

		return -EPERM;

	}



	bond->params.fail_over_mac = fail_over_mac;

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

		bond->dev->name, fail_over_mac_tbl[fail_over_mac].modename,

		fail_over_mac);

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

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

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



	return 0;

}

drivers/net/bonding/bond_options.h

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ enum { 
	BOND_OPT_XMIT_HASH,

	BOND_OPT_ARP_VALIDATE,

	BOND_OPT_ARP_ALL_TARGETS,

	BOND_OPT_FAIL_OVER_MAC,

	BOND_OPT_LAST

};
@@ -111,4 +112,6 @@ int bond_option_arp_validate_set(struct bonding *bond, 
				 struct bond_opt_value *newval);

int bond_option_arp_all_targets_set(struct bonding *bond,

				    struct bond_opt_value *newval);

int bond_option_fail_over_mac_set(struct bonding *bond,

				  struct bond_opt_value *newval);

#endif /* _BOND_OPTIONS_H */

drivers/net/bonding/bond_procfs.c

+5 −3
Original line number Diff line number Diff line
@@ -77,9 +77,11 @@ static void bond_info_show_master(struct seq_file *seq) 
		   bond_mode_name(bond->params.mode));



	if (bond->params.mode == BOND_MODE_ACTIVEBACKUP &&

	    bond->params.fail_over_mac)

		seq_printf(seq, " (fail_over_mac %s)",

		   fail_over_mac_tbl[bond->params.fail_over_mac].modename);

	    bond->params.fail_over_mac) {

		optval = bond_opt_get_val(BOND_OPT_FAIL_OVER_MAC,

					  bond->params.fail_over_mac);

		seq_printf(seq, " (fail_over_mac %s)", optval->string);

	}



	seq_printf(seq, "\n");