diff options
| author | Ethan Jackson <ethan@nicira.com> | 2012-04-16 15:01:09 -0700 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2012-04-17 13:36:32 -0700 |
| commit | b20a8f7c11fbff647cc65cc3db22a22e5d5cad0b (patch) | |
| tree | 5e53882b8ab8c935fe007f06b21ee08536e96ceb /vswitchd | |
| parent | bf83f7c82f28d920487fb00741e5b0b692d93d36 (diff) | |
lacp: Remove heartbeat mode.
The LACP heartbeat mode was used to monitor interfaces for
connectivity. It turns out that LACP is inferior to CFM for this
purpose. For the sake of simplicity this patch removes the
feature.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 5 | ||||
| -rw-r--r-- | vswitchd/vswitch.xml | 8 |
2 files changed, 0 insertions, 13 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index c7349a4d..f4a10e6a 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2859,11 +2859,6 @@ port_configure_lacp(struct port *port, struct lacp_settings *s) ? priority : UINT16_MAX - !list_is_short(&port->ifaces)); - s->heartbeat = !strcmp(ovsrec_port_get_other_config_value(port->cfg, - "lacp-heartbeat", - "false"), - "true"); - lacp_time = ovsrec_port_get_other_config_value(port->cfg, "lacp-time", "slow"); s->fast = !strcasecmp(lacp_time, "fast"); diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 61f472ad..13dd3148 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -905,14 +905,6 @@ rate of once every 30 seconds. </p> </column> - - <column name="other_config" key="lacp-heartbeat" - type='{"type": "boolean"}'> - Treat LACP like a simple heartbeat protocol for link state - monitoring. Most features of the LACP protocol are disabled - when this mode is in use. The default if not specified is - <code>false</code>. - </column> </group> <group title="SLB Configuration"> |