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
lib/ofpbuf: Compact
[sliver-openvswitch.git]
/
ofproto
/
ofproto-dpif-xlate.c
diff --git
a/ofproto/ofproto-dpif-xlate.c
b/ofproto/ofproto-dpif-xlate.c
index
df7cf7d
..
e26b7c9
100644
(file)
--- a/
ofproto/ofproto-dpif-xlate.c
+++ b/
ofproto/ofproto-dpif-xlate.c
@@
-1693,7
+1693,7
@@
compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port,
/* If 'struct flow' gets additional metadata, we'll need to zero it out
* before traversing a patch port. */
/* If 'struct flow' gets additional metadata, we'll need to zero it out
* before traversing a patch port. */
- BUILD_ASSERT_DECL(FLOW_WC_SEQ == 2
4
);
+ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 2
5
);
if (!xport) {
xlate_report(ctx, "Nonexistent output port");
if (!xport) {
xlate_report(ctx, "Nonexistent output port");
@@
-2001,7
+2001,7
@@
xlate_select_group(struct xlate_ctx *ctx, struct group_dpif *group)
const struct ofputil_bucket *bucket;
uint32_t basis;
const struct ofputil_bucket *bucket;
uint32_t basis;
- basis = hash_
bytes(ctx->xin->flow.dl_dst, sizeof ctx->xin->flow.dl_dst
, 0);
+ basis = hash_
mac(ctx->xin->flow.dl_dst, 0
, 0);
bucket = group_best_live_bucket(ctx, group, basis);
if (bucket) {
memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);
bucket = group_best_live_bucket(ctx, group, basis);
if (bucket) {
memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);