git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use ovs_assert instead of assert
[sliver-openvswitch.git]
/
lib
/
flow.c
diff --git
a/lib/flow.c
b/lib/flow.c
index
a13519e
..
2a3dd3d
100644
(file)
--- a/
lib/flow.c
+++ b/
lib/flow.c
@@
-16,7
+16,6
@@
#include <config.h>
#include <sys/types.h>
#include "flow.h"
#include <config.h>
#include <sys/types.h>
#include "flow.h"
-#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
#include <errno.h>
#include <inttypes.h>
#include <limits.h>
@@
-31,6
+30,7
@@
#include "csum.h"
#include "dynamic-string.h"
#include "hash.h"
#include "csum.h"
#include "dynamic-string.h"
#include "hash.h"
+#include "jhash.h"
#include "match.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
#include "match.h"
#include "ofpbuf.h"
#include "openflow/openflow.h"
@@
-347,7
+347,7
@@
flow_extract(struct ofpbuf *packet, uint32_t skb_priority, uint32_t skb_mark,
memset(flow, 0, sizeof *flow);
if (tnl) {
memset(flow, 0, sizeof *flow);
if (tnl) {
- assert(tnl != &flow->tunnel);
+
ovs_
assert(tnl != &flow->tunnel);
flow->tunnel = *tnl;
}
flow->in_port = ofp_in_port;
flow->tunnel = *tnl;
}
flow->in_port = ofp_in_port;
@@
-723,7
+723,7
@@
flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis)
fields.tp_port = flow->tp_src ^ flow->tp_dst;
}
}
fields.tp_port = flow->tp_src ^ flow->tp_dst;
}
}
- return hash_bytes(&fields, sizeof fields, basis);
+ return
j
hash_bytes(&fields, sizeof fields, basis);
}
/* Hashes the portions of 'flow' designated by 'fields'. */
}
/* Hashes the portions of 'flow' designated by 'fields'. */
@@
-734,7
+734,7
@@
flow_hash_fields(const struct flow *flow, enum nx_hash_fields fields,
switch (fields) {
case NX_HASH_FIELDS_ETH_SRC:
switch (fields) {
case NX_HASH_FIELDS_ETH_SRC:
- return hash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
+ return
j
hash_bytes(flow->dl_src, sizeof flow->dl_src, basis);
case NX_HASH_FIELDS_SYMMETRIC_L4:
return flow_hash_symmetric_l4(flow, basis);
case NX_HASH_FIELDS_SYMMETRIC_L4:
return flow_hash_symmetric_l4(flow, basis);
@@
-1149,7
+1149,7
@@
miniflow_hash_in_minimask(const struct miniflow *flow,
}
}
}
}
- return mhash_finish(hash,
p - mask->masks.values
);
+ return mhash_finish(hash,
(p - mask->masks.values) * 4
);
}
/* Returns a hash value for the bits of 'flow' where there are 1-bits in
}
/* Returns a hash value for the bits of 'flow' where there are 1-bits in
@@
-1178,7
+1178,7
@@
flow_hash_in_minimask(const struct flow *flow, const struct minimask *mask,
}
}
}
}
- return mhash_finish(hash,
p - mask->masks.values
);
+ return mhash_finish(hash,
(p - mask->masks.values) * 4
);
}
\f
/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'
}
\f
/* Initializes 'dst' as a copy of 'src'. The caller must eventually free 'dst'