diff options
| author | Andy Zhou <azhou@nicira.com> | 2014-03-04 14:20:19 -0800 |
|---|---|---|
| committer | Andy Zhou <azhou@nicira.com> | 2014-03-25 13:23:41 -0700 |
| commit | a79f29f20e556514259d8593de779fc1b15c4055 (patch) | |
| tree | 98887129126dfc74437e7df79220caecad9b226e /lib/nx-match.c | |
| parent | a0cbddc04b3a152812712bfbdcfb17119e80317d (diff) | |
| download | openvswitch-a79f29f20e556514259d8593de779fc1b15c4055.tar.gz | |
lib/flow: add dp_hash and recirc_id to struct flow
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/nx-match.c')
| -rw-r--r-- | lib/nx-match.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/nx-match.c b/lib/nx-match.c index de790098a..fe6d80f7f 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -572,9 +572,22 @@ nx_put_raw(struct ofpbuf *b, bool oxm, const struct match *match, int match_len; int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 24); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 25); /* Metadata. */ + if (match->wc.masks.dp_hash) { + if (!oxm) { + nxm_put_32m(b, NXM_NX_DP_HASH, htonl(flow->dp_hash), + htonl(match->wc.masks.dp_hash)); + } + } + + if (match->wc.masks.recirc_id) { + if (!oxm) { + nxm_put_32(b, NXM_NX_RECIRC_ID, htonl(flow->recirc_id)); + } + } + if (match->wc.masks.in_port.ofp_port) { ofp_port_t in_port = flow->in_port.ofp_port; if (oxm) { |