xenserver: Restore XS5.5 compatibility for vif script.

[openvswitch] / ofproto / netflow.c

diff --git a/ofproto/netflow.c b/ofproto/netflow.c
index b016663867419db61caa8a7ec144f14c6ad6e8e9..34d571f08c481282266ed8e9019d1c47dde13ccc 100644 (file)
--- a/ofproto/netflow.c
+++ b/ofproto/netflow.c
@@ -37,8 +37,6 @@
 
 #define NETFLOW_V5_VERSION 5
 
-static const int ACTIVE_TIMEOUT_DEFAULT = 600;
-
 /* Every NetFlow v5 message contains the header that follows.  This is
  * followed by up to thirty records that describe a terminating flow.
  * We only send a single record per NetFlow message.
@@ -210,10 +208,10 @@ netflow_set_options(struct netflow *nf,
     collectors_create(&nf_options->collectors, 0, &nf->collectors);
 
     old_timeout = nf->active_timeout;
-    if (nf_options->active_timeout > 0) {
+    if (nf_options->active_timeout >= 0) {
         nf->active_timeout = nf_options->active_timeout;
     } else {
-        nf->active_timeout = ACTIVE_TIMEOUT_DEFAULT;
+        nf->active_timeout = NF_ACTIVE_TIMEOUT_DEFAULT;
     }
     nf->active_timeout *= 1000;
     if (old_timeout != nf->active_timeout) {