hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bonding: remove hardcoded value 

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

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mahesh Bandewar 2017-03-08 10:55:56 -08:00 committed by David S. Miller
parent 4493b81bea
commit 8b426dc54c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/bonding/bond_main.c
View File

@ -4254,6 +4254,7 @@ static int bond_check_params(struct bond_params *params)
int arp_all_targets_value; int arp_all_targets_value;
u16 ad_actor_sys_prio = 0; u16 ad_actor_sys_prio = 0;
u16 ad_user_port_key = 0; u16 ad_user_port_key = 0;
int tlb_dynamic_lb = 0;
/* Convert string parameters. */ /* Convert string parameters. */
if (mode) { if (mode) {
@ -4566,6 +4567,17 @@ static int bond_check_params(struct bond_params *params)
} }
ad_user_port_key = valptr->value; 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) { if (lp_interval == 0) {
pr_warn("Warning: ip_interval must be between 1 and %d, so it was reset to %d\n", 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); 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->min_links = min_links;
params->lp_interval = lp_interval; params->lp_interval = lp_interval;
params->packets_per_slave = packets_per_slave; 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; params->ad_actor_sys_prio = ad_actor_sys_prio;
eth_zero_addr(params->ad_actor_system); eth_zero_addr(params->ad_actor_system);
params->ad_user_port_key = ad_user_port_key; params->ad_user_port_key = ad_user_port_key;