diff options
| author | Ethan Jackson <ethan@nicira.com> | 2012-04-16 14:55:58 -0700 |
|---|---|---|
| committer | Ethan Jackson <ethan@nicira.com> | 2012-04-17 13:36:32 -0700 |
| commit | bf83f7c82f28d920487fb00741e5b0b692d93d36 (patch) | |
| tree | 318a1661499b25b2e47c396cf22af2d49bd29364 /vswitchd | |
| parent | cea157688977bbbb136f9c3bfe020fe485b43d39 (diff) | |
lacp: Remove custom transmission intervals.
Open vSwitch allowed users to set a custom LACP PDU transmission
interval. This turned out to be an ill conceived idea which was
more confusing than useful. This patch reverts Open vSwitch to the
behavior supported in the LACP specification: two transmission
intervals, fast and slow.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
Diffstat (limited to 'vswitchd')
| -rw-r--r-- | vswitchd/bridge.c | 14 | ||||
| -rw-r--r-- | vswitchd/vswitch.xml | 23 |
2 files changed, 8 insertions, 29 deletions
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 74cba874..c7349a4d 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2825,7 +2825,6 @@ static struct lacp_settings * port_configure_lacp(struct port *port, struct lacp_settings *s) { const char *lacp_time, *system_id; - long long int custom_time; int priority; if (!enable_lacp(port, &s->active)) { @@ -2867,18 +2866,7 @@ port_configure_lacp(struct port *port, struct lacp_settings *s) lacp_time = ovsrec_port_get_other_config_value(port->cfg, "lacp-time", "slow"); - custom_time = atoi(lacp_time); - if (!strcmp(lacp_time, "fast")) { - s->lacp_time = LACP_TIME_FAST; - } else if (!strcmp(lacp_time, "slow")) { - s->lacp_time = LACP_TIME_SLOW; - } else if (custom_time > 0) { - s->lacp_time = LACP_TIME_CUSTOM; - s->custom_time = custom_time; - } else { - s->lacp_time = LACP_TIME_SLOW; - } - + s->fast = !strcasecmp(lacp_time, "fast"); return s; } diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index ef019746..61f472ad 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -894,24 +894,15 @@ numerically lower priority. </column> - <column name="other_config" key="lacp-time"> + <column name="other_config" key="lacp-time" + type='{"type": "string", "enum": ["set", ["fast", "slow"]]}'> <p> The LACP timing which should be used on this <ref table="Port"/>. - Possible values are <code>fast</code>, <code>slow</code> and a - positive number of milliseconds. By default <code>slow</code> is - used. When configured to be <code>fast</code> LACP heartbeats are - requested at a rate of once per second causing connectivity - problems to be detected more quickly. In <code>slow</code> mode, - heartbeats are requested at a rate of once every 30 seconds. - </p> - - <p> - Users may manually set a heartbeat transmission rate to increase - the fault detection speed further. When manually set, OVS expects - the partner switch to be configured with the same transmission - rate. Manually setting <code>lacp-time</code> to something other - than <code>fast</code> or <code>slow</code> is not supported by the - LACP specification. + By default <code>slow</code> is used. When configured to be + <code>fast</code> LACP heartbeats are requested at a rate of once + per second causing connectivity problems to be detected more + quickly. In <code>slow</code> mode, heartbeats are requested at a + rate of once every 30 seconds. </p> </column> |