Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / ofproto / netflow.h

diff --git a/ofproto/netflow.h b/ofproto/netflow.h
index f6fad62..bf5bf45 100644 (file)
--- a/ofproto/netflow.h
+++ b/ofproto/netflow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include "flow.h"
-#include "svec.h"
+#include "sset.h"
 
 /* Default active timeout interval, in seconds.
  *
@@ -31,7 +31,7 @@
 struct ofexpired;
 
 struct netflow_options {
-    struct svec collectors;
+    struct sset collectors;
     uint8_t engine_type;
     uint8_t engine_id;
     int active_timeout;
@@ -62,6 +62,7 @@ void netflow_expire(struct netflow *, struct netflow_flow *,
                     struct ofexpired *);
 void netflow_run(struct netflow *);
 
+void netflow_flow_init(struct netflow_flow *);
 void netflow_flow_clear(struct netflow_flow *);
 void netflow_flow_update_time(struct netflow *, struct netflow_flow *,
                               long long int used);