ofp-util: Work on decoding OF1.1 flow_mods.

[openvswitch] / ofproto / netflow.h

diff --git a/ofproto/netflow.h b/ofproto/netflow.h
index bf5bf45bf69006184b3d6107ec233504e654d662..c01ff15748763239c7a3468011dbe470e535b51f 100644 (file)
--- a/ofproto/netflow.h
+++ b/ofproto/netflow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef NETFLOW_H
-#define NETFLOW_H 1
+#ifndef OFPROTO_NETFLOW_H
+#define OFPROTO_NETFLOW_H 1
 
 #include <stdint.h>
 #include "flow.h"
@@ -60,7 +60,9 @@ void netflow_destroy(struct netflow *);
 int netflow_set_options(struct netflow *, const struct netflow_options *);
 void netflow_expire(struct netflow *, struct netflow_flow *,
                     struct ofexpired *);
-void netflow_run(struct netflow *);
+
+bool netflow_run(struct netflow *);
+void netflow_wait(struct netflow *);
 
 void netflow_flow_init(struct netflow_flow *);
 void netflow_flow_clear(struct netflow_flow *);