Merge commit 'origin/master'

[openvswitch] / switch / switch-flow.c

diff --git a/switch/switch-flow.c b/switch/switch-flow.c
index cc462c0ef87ef82dbdd4e26303b69d0a602599af..e0410afc445323db4adee3d98dcb1e4058189d68 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"
@@ -259,7 +259,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++;