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

Commit 8b426dc5 authored by Mahesh Bandewar's avatar Mahesh Bandewar Committed by David S. Miller
Browse files

bonding: remove hardcoded value 



Eliminate hard-coded value and use the default that is set.

Signed-off-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4493b81b

drivers/net/bonding/bond_main.c

+13 −1
Original line number Diff line number Diff line
@@ -4254,6 +4254,7 @@ static int bond_check_params(struct bond_params *params) 
	int arp_all_targets_value;

	u16 ad_actor_sys_prio = 0;

	u16 ad_user_port_key = 0;

	int tlb_dynamic_lb = 0;



	/* Convert string parameters. */

	if (mode) {
@@ -4566,6 +4567,17 @@ static int bond_check_params(struct bond_params *params) 
	}

	ad_user_port_key = valptr->value;



	if (bond_mode == BOND_MODE_TLB) {

		bond_opt_initstr(&newval, "default");

		valptr = bond_opt_parse(bond_opt_get(BOND_OPT_TLB_DYNAMIC_LB),

					&newval);

		if (!valptr) {

			pr_err("Error: No tlb_dynamic_lb default value");

			return -EINVAL;

		}

		tlb_dynamic_lb = valptr->value;

	}



	if (lp_interval == 0) {

		pr_warn("Warning: ip_interval must be between 1 and %d, so it was reset to %d\n",

			INT_MAX, BOND_ALB_DEFAULT_LP_INTERVAL);
@@ -4593,7 +4605,7 @@ static int bond_check_params(struct bond_params *params) 
	params->min_links = min_links;

	params->lp_interval = lp_interval;

	params->packets_per_slave = packets_per_slave;

	params->tlb_dynamic_lb = 1; /* Default value */

	params->tlb_dynamic_lb = tlb_dynamic_lb;

	params->ad_actor_sys_prio = ad_actor_sys_prio;

	eth_zero_addr(params->ad_actor_system);

	params->ad_user_port_key = ad_user_port_key;