]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: bonding: Fix transmit load balancing in balance-alb mode
authorKosuke Tatsukawa <tatsu@ab.jp.nec.com>
Thu, 20 Jul 2017 05:20:40 +0000 (05:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Jul 2017 22:34:40 +0000 (15:34 -0700)
balance-alb mode used to have transmit dynamic load balancing feature
enabled by default.  However, transmit dynamic load balancing no longer
works in balance-alb after commit 8bc3f1172a6b ("bonding: remove
hardcoded value").

Both balance-tlb and balance-alb use the function bond_do_alb_xmit() to
send packets.  This function uses the parameter tlb_dynamic_lb.
tlb_dynamic_lb used to have the default value of 1 for balance-alb, but
now the value is set to 0 except in balance-tlb.

Re-enable transmit dyanmic load balancing by initializing tlb_dynamic_lb
for balance-alb similar to balance-tlb.

Fixes: 8bc3f1172a6b ("bonding: remove hardcoded value")
Signed-off-by: Kosuke Tatsukawa <tatsu@ab.jp.nec.com>
Acked-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index 14ff622190a5b90c827c1be8a0bd9ca54821ec4f..181839d6fbea44a8b6962f94703e4293645cc21c 100644 (file)
@@ -4596,7 +4596,7 @@ static int bond_check_params(struct bond_params *params)
        }
        ad_user_port_key = valptr->value;
 
-       if (bond_mode == BOND_MODE_TLB) {
+       if ((bond_mode == BOND_MODE_TLB) || (bond_mode == BOND_MODE_ALB)) {
                bond_opt_initstr(&newval, "default");
                valptr = bond_opt_parse(bond_opt_get(BOND_OPT_TLB_DYNAMIC_LB),
                                        &newval);