vswitchd: Initial conversion to database-based configuration.

[openvswitch] / ofproto / netflow.c

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index 7c77c64ff2ff0019a9ac5766e77defc2bdce681b..2c7ae9e43ec564367c60beaacabd0062fff29b28 100644 (file)
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -20,7 +20,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "cfg.h"
 #include "collectors.h"
 #include "flow.h"
 #include "netflow.h"
@@ -211,7 +210,7 @@ netflow_set_options(struct netflow *nf,
     collectors_create(&nf_options->collectors, 0, &nf->collectors);
 
     old_timeout = nf->active_timeout;
-    if (nf_options->active_timeout != -1) {
+    if (nf_options->active_timeout < 0) {
         nf->active_timeout = nf_options->active_timeout;
     } else {
         nf->active_timeout = ACTIVE_TIMEOUT_DEFAULT;