Added OFPFC_MODIFY_STRICT flow mod command.

[openvswitch] / switch / switch-flow.c

diff --git a/switch/switch-flow.c b/switch/switch-flow.c
index cc462c0ef87ef82dbdd4e26303b69d0a602599af..a42d00fb32e60da9cd9b335b942423724723da87 100644 (file)
--- a/switch/switch-flow.c
+++ b/switch/switch-flow.c
@@ -37,7 +37,7 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "buffer.h"
+#include "ofpbuf.h"
 #include "openflow.h"
 #include "packets.h"
 #include "timeval.h"
@@ -85,12 +85,13 @@ flow_matches_2wild(const struct sw_flow_key *a, const struct sw_flow_key *b)
 }
 
 /* Returns nonzero if 't' (the table entry's key) and 'd' (the key 
- * describing the deletion) match, that is, if their fields are 
+ * describing the match) match, that is, if their fields are 
  * equal modulo wildcards, zero otherwise.  If 'strict' is nonzero, the
  * wildcards must match in both 't_key' and 'd_key'.  Note that the
  * table's wildcards are ignored unless 'strict' is set. */
 int
-flow_del_matches(const struct sw_flow_key *t, const struct sw_flow_key *d, int strict)
+flow_matches_desc(const struct sw_flow_key *t, const struct sw_flow_key *d, 
+        int strict)
 {
     if (strict && d->wildcards != t->wildcards) {
         return 0;
@@ -259,7 +260,7 @@ bool flow_timeout(struct sw_flow *flow)
     }
 }
 
-void flow_used(struct sw_flow *flow, struct buffer *buffer)
+void flow_used(struct sw_flow *flow, struct ofpbuf *buffer)
 {
     flow->used = time_now();
     flow->packet_count++;