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

Commit 388d3a6d authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bonding: convert primary_reselect to use the new option API 



This patch adds the necessary changes so primary_reselect 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 180222f0

drivers/net/bonding/bond_main.c

+6 −12
Original line number Diff line number Diff line
@@ -206,13 +206,6 @@ static int bond_mode = BOND_MODE_ROUNDROBIN; 
static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2;

static int lacp_fast;



const struct bond_parm_tbl pri_reselect_tbl[] = {

{	"always",		BOND_PRI_RESELECT_ALWAYS},

{	"better",		BOND_PRI_RESELECT_BETTER},

{	"failure",		BOND_PRI_RESELECT_FAILURE},

{	NULL,			-1},

};



/*-------------------------- Forward declarations ---------------------------*/



static int bond_init(struct net_device *bond_dev);
@@ -4248,14 +4241,15 @@ static int bond_check_params(struct bond_params *params) 
	}



	if (primary && primary_reselect) {

		primary_reselect_value = bond_parse_parm(primary_reselect,

							 pri_reselect_tbl);

		if (primary_reselect_value == -1) {

		bond_opt_initstr(&newval, primary_reselect);

		valptr = bond_opt_parse(bond_opt_get(BOND_OPT_PRIMARY_RESELECT),

					&newval);

		if (!valptr) {

			pr_err("Error: Invalid primary_reselect \"%s\"\n",

			       primary_reselect ==

					NULL ? "NULL" : primary_reselect);

			       primary_reselect);

			return -EINVAL;

		}

		primary_reselect_value = valptr->value;

	} else {

		primary_reselect_value = BOND_PRI_RESELECT_ALWAYS;

	}

drivers/net/bonding/bond_netlink.c

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

			nla_get_u8(data[IFLA_BOND_PRIMARY_RESELECT]);



		err = bond_option_primary_reselect_set(bond, primary_reselect);

		bond_opt_initval(&newval, primary_reselect);

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

		if (err)

			return err;

	}

drivers/net/bonding/bond_options.c

+19 −11
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ static struct bond_opt_value bond_num_peer_notif_tbl[] = { 
	{ NULL,      -1,  0}

};



static struct bond_opt_value bond_primary_reselect_tbl[] = {

	{ "always",  BOND_PRI_RESELECT_ALWAYS,  BOND_VALFLAG_DEFAULT},

	{ "better",  BOND_PRI_RESELECT_BETTER,  0},

	{ "failure", BOND_PRI_RESELECT_FAILURE, 0},

	{ NULL,      -1},

};



static struct bond_option bond_opts[] = {

	[BOND_OPT_MODE] = {

		.id = BOND_OPT_MODE,
@@ -217,6 +224,13 @@ static struct bond_option bond_opts[] = { 
						BIT(BOND_MODE_ALB)),

		.set = bond_option_primary_set

	},

	[BOND_OPT_PRIMARY_RESELECT] = {

		.id = BOND_OPT_PRIMARY_RESELECT,

		.name = "primary_reselect",

		.desc = "Reselect primary slave once it comes up",

		.values = bond_primary_reselect_tbl,

		.set = bond_option_primary_reselect_set

	},

	{ }

};
@@ -943,18 +957,12 @@ int bond_option_primary_set(struct bonding *bond, struct bond_opt_value *newval) 
	return 0;

}



int bond_option_primary_reselect_set(struct bonding *bond, int primary_reselect)

int bond_option_primary_reselect_set(struct bonding *bond,

				     struct bond_opt_value *newval)

{

	if (bond_parm_tbl_lookup(primary_reselect, pri_reselect_tbl) < 0) {

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

		       bond->dev->name, primary_reselect);

		return -EINVAL;

	}



	bond->params.primary_reselect = primary_reselect;

	pr_info("%s: setting primary_reselect to %s (%d).\n",

		bond->dev->name, pri_reselect_tbl[primary_reselect].modename,

		primary_reselect);

	pr_info("%s: setting primary_reselect to %s (%llu).\n",

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

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



	block_netpoll_tx();

	write_lock_bh(&bond->curr_slave_lock);

drivers/net/bonding/bond_options.h

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ enum { 
	BOND_OPT_NUM_PEER_NOTIF,

	BOND_OPT_MIIMON,

	BOND_OPT_PRIMARY,

	BOND_OPT_PRIMARY_RESELECT,

	BOND_OPT_LAST

};
@@ -144,4 +145,6 @@ int bond_option_num_peer_notif_set(struct bonding *bond, 
int bond_option_miimon_set(struct bonding *bond, struct bond_opt_value *newval);

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

#endif /* _BOND_OPTIONS_H */

drivers/net/bonding/bond_procfs.c

+5 −2
Original line number Diff line number Diff line
@@ -97,9 +97,12 @@ static void bond_info_show_master(struct seq_file *seq) 
		seq_printf(seq, "Primary Slave: %s",

			   (bond->primary_slave) ?

			   bond->primary_slave->dev->name : "None");

		if (bond->primary_slave)

		if (bond->primary_slave) {

			optval = bond_opt_get_val(BOND_OPT_PRIMARY_RESELECT,

						  bond->params.primary_reselect);

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

		   pri_reselect_tbl[bond->params.primary_reselect].modename);

				   optval->string);

		}



		seq_printf(seq, "\nCurrently Active Slave: %s\n",

			   (curr) ? curr->dev->name : "None");