diff options
Diffstat (limited to 'lib/nx-match.c')
| -rw-r--r-- | lib/nx-match.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/nx-match.c b/lib/nx-match.c index 1f72a8418..114c35ba3 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, 2012, 2013, 2014 Nicira, Inc. + * Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -817,7 +817,7 @@ nx_put_raw(struct ofpbuf *b, enum ofp_version oxm, const struct match *match, int match_len; int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 29); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 30); /* Metadata. */ if (match->wc.masks.dp_hash) { @@ -829,6 +829,10 @@ nx_put_raw(struct ofpbuf *b, enum ofp_version oxm, const struct match *match, nxm_put_32(b, MFF_RECIRC_ID, oxm, htonl(flow->recirc_id)); } + if (match->wc.masks.conj_id) { + nxm_put_32(b, MFF_CONJ_ID, oxm, htonl(flow->conj_id)); + } + if (match->wc.masks.in_port.ofp_port) { ofp_port_t in_port = flow->in_port.ofp_port; if (oxm) { |