dscp member of struct ovsdb_jsonrpc_options isn't initialized uniformly.
Initialize the member by ovsdb_jsonrpc_default_options uniformly.

Signed-off-by: Isaku Yamahata <[email protected]>
---
 ovsdb/jsonrpc-server.c |    1 +
 ovsdb/ovsdb-server.c   |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index bb887d0..bc0c89e 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -137,6 +137,7 @@ ovsdb_jsonrpc_default_options(const char *target)
     options->probe_interval = (stream_or_pstream_needs_probes(target)
                                ? RECONNECT_DEFAULT_PROBE_INTERVAL
                                : 0);
+    options->dscp = DSCP_DEFAULT;
     return options;
 }
 
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 1bf10d9..68f212f 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -469,7 +469,6 @@ add_manager_options(struct shash *remotes, const struct 
ovsdb_row *row)
         options->probe_interval = probe_interval;
     }
 
-    options->dscp = DSCP_DEFAULT;
     dscp_string = read_map_string_column(row, "other_config", "dscp");
     if (dscp_string) {
         int dscp = atoi(dscp_string);
-- 
1.7.1.1

_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to