projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofproto: Generalize facet_put__() so that it is more useful.
[openvswitch]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index 38dee7b061f9f2aa36fbb1fa3675c0628af5eea1..87ca0f282d437c4c6c61a946eec18007cdb6ebfd 100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-22,9
+22,9
@@
#include <string.h>
#include "byte-order.h"
#include "coverage.h"
#include <string.h>
#include "byte-order.h"
#include "coverage.h"
+#include "dpif.h"
#include "dynamic-string.h"
#include "hash.h"
#include "dynamic-string.h"
#include "hash.h"
-#include "ofp-util.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "openvswitch/datapath-protocol.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "openvswitch/datapath-protocol.h"
@@
-235,9
+235,9
@@
flow_extract(struct ofpbuf *packet, ovs_be64 tun_id, uint16_t in_port,
*/
void
flow_extract_stats(const struct flow *flow, struct ofpbuf *packet,
*/
void
flow_extract_stats(const struct flow *flow, struct ofpbuf *packet,
-
struct odp
_flow_stats *stats)
+
struct dpif
_flow_stats *stats)
{
{
- memset(stats,
'\0'
, sizeof(*stats));
+ memset(stats,
0
, sizeof(*stats));
if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) {
if ((flow->nw_proto == IP_TYPE_TCP) && packet->l7) {
if ((flow->dl_type == htons(ETH_TYPE_IP)) && packet->l4) {
if ((flow->nw_proto == IP_TYPE_TCP) && packet->l7) {