aboutsummaryrefslogtreecommitdiff
path: root/lib/nx-match.h
diff options
context:
space:
mode:
authorAnsis Atteka <aatteka@nicira.com>2012-04-25 15:48:40 -0700
committerAnsis Atteka <aatteka@nicira.com>2012-04-26 15:22:48 -0700
commit47284b1fc6fe84a9b5b43b49bef868e4eb230cd1 (patch)
tree2d37c22ae94ddcaa1eafa9574bf3302f3e25ea6c /lib/nx-match.h
parenta5f607bc8994e5ed870a62062df54e1b5753c6a2 (diff)
nicira-ext: Support masking of nd_target field
This commit adds support to specify a mask in CIDR format for the nd_target field. Signed-off-by: Ansis Atteka <aatteka@nicira.com>
Diffstat (limited to 'lib/nx-match.h')
-rw-r--r--lib/nx-match.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/nx-match.h b/lib/nx-match.h
index 592d46fb..296a63a0 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -90,7 +90,7 @@ void nxm_decode(struct mf_subfield *, ovs_be32 header, ovs_be16 ofs_nbits);
void nxm_decode_discrete(struct mf_subfield *, ovs_be32 header,
ovs_be16 ofs, ovs_be16 n_bits);
-BUILD_ASSERT_DECL(FLOW_WC_SEQ == 9);
+BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10);
/* Upper bound on the length of an nx_match. The longest nx_match (an
* IPV6 neighbor discovery message using 5 registers) would be:
*
@@ -111,7 +111,7 @@ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 9);
* NXM_OF_IPV6_LABEL 4 4 -- 8
* NXM_OF_ICMP_TYPE 4 1 -- 5
* NXM_OF_ICMP_CODE 4 1 -- 5
- * NXM_NX_ND_TARGET 4 16 -- 20
+ * NXM_NX_ND_TARGET 4 16 16 36
* NXM_NX_ND_SLL 4 6 -- 10
* NXM_NX_REG_W(0) 4 4 4 12
* NXM_NX_REG_W(1) 4 4 4 12
@@ -123,11 +123,11 @@ BUILD_ASSERT_DECL(FLOW_WC_SEQ == 9);
* NXM_NX_REG_W(7) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
* -------------------------------------------
- * total 311
+ * total 327
*
* So this value is conservative.
*/
-#define NXM_MAX_LEN 384
+#define NXM_MAX_LEN 400
/* This is my guess at the length of a "typical" nx_match, for use in
* predicting space requirements. */