Merge "master" into "next".

[cascardo/ovs.git] / ofproto / netflow.h

diff --git a/ofproto/netflow.h b/ofproto/netflow.h
index 2450506..701ffd4 100644 (file)
--- a/ofproto/netflow.h
+++ b/ofproto/netflow.h
@@ -21,6 +21,8 @@
 #include "flow.h"
 #include "svec.h"
 
+static const int NF_ACTIVE_TIMEOUT_DEFAULT = 600;
+
 struct ofexpired;
 
 struct netflow_options {