lacp: New other_config setting "lacp-force-aggregatable".

[openvswitch] / vswitchd / bridge.c

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 84ed03e80122008ce3f38fe055dfa9f7b5b55f81..270ab800d36bcb589e4476b0195cf9dfc618e9ed 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3193,6 +3193,10 @@ port_reconfigure_lacp(struct port *port)
                                              "false"),
                        "true");
 
+    s.force_agg = !strcmp(get_port_other_config(port->cfg,
+                                                "lacp-force-aggregatable",
+                                                "false"), "true");
+
     lacp_time = get_port_other_config(port->cfg, "lacp-time", "slow");
     custom_time = atoi(lacp_time);
     if (!strcmp(lacp_time, "fast")) {
@@ -3258,6 +3262,8 @@ port_reconfigure_bond(struct port *port)
 
     s.up_delay = MAX(0, port->cfg->bond_updelay);
     s.down_delay = MAX(0, port->cfg->bond_downdelay);
+    s.basis = atoi(get_port_other_config(port->cfg, "bond-hash-basis", "0"));
+
     s.rebalance_interval = atoi(
         get_port_other_config(port->cfg, "bond-rebalance-interval", "10000"));
     if (s.rebalance_interval < 1000) {