lacp: New "lacp-heartbeat" mode.

[openvswitch] / vswitchd / bridge.c

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 09fc37d02133582a62f283bba9901b01ce8b327b..d883596de83c0e129c088974516cd4554d6495d8 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3196,12 +3196,8 @@ port_reconfigure_lacp(struct port *port)
                   ? priority
                   : UINT16_MAX - !list_is_short(&port->ifaces));
 
-    s.strict = !strcmp(get_port_other_config(port->cfg, "lacp-strict",
-                                             "false"),
-                       "true");
-
-    s.force_agg = !strcmp(get_port_other_config(port->cfg,
-                                                "lacp-force-aggregatable",
+    s.heartbeat = !strcmp(get_port_other_config(port->cfg,
+                                                "lacp-heartbeat",
                                                 "false"), "true");
 
     lacp_time = get_port_other_config(port->cfg, "lacp-time", "slow");