From: Joe Stringer <joestringer@nicira.com>
Date: Wed, 30 Apr 2014 21:50:59 +0000 (+1200)
Subject: bridge: Remove traces of flow-eviction-threshold.
X-Git-Tag: sliver-openvswitch-2.2.90-1~3^2~25
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=6e9231f70f31317619d43838f54fc6abce3942ac

bridge: Remove traces of flow-eviction-threshold.

This configuration option was shifted in 2.0, then removed in 2.1.
Remove the misleading log message.

Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 84e9ab82b..12852b420 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -626,13 +626,6 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
         bridge_configure_stp(br);
         bridge_configure_tables(br);
         bridge_configure_dp_desc(br);
-
-        if (smap_get(&br->cfg->other_config, "flow-eviction-threshold")) {
-            /* XXX: Remove this warning message eventually. */
-            VLOG_WARN_ONCE("As of June 2013, flow-eviction-threshold has been"
-                           " moved to the Open_vSwitch table.  Ignoring its"
-                           " setting in the bridge table.");
-        }
     }
     free(managers);