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
Add OXM_OF_METADATA field as a step toward OpenFlow 1.1 support.
[sliver-openvswitch.git]
/
lib
/
nx-match.h
diff --git
a/lib/nx-match.h
b/lib/nx-match.h
index
22db477
..
c814275
100644
(file)
--- a/
lib/nx-match.h
+++ b/
lib/nx-match.h
@@
-90,9
+90,9
@@
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);
\f
void nxm_decode_discrete(struct mf_subfield *, ovs_be32 header,
ovs_be16 ofs, ovs_be16 n_bits);
\f
-BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1
1
);
+BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1
2
);
/* Upper bound on the length of an nx_match. The longest nx_match (an
/* Upper bound on the length of an nx_match. The longest nx_match (an
- * IPV6 neighbor discovery message using
5
registers) would be:
+ * IPV6 neighbor discovery message using
all the
registers) would be:
*
* header value mask total
* ------ ----- ---- -----
*
* header value mask total
* ------ ----- ---- -----
@@
-122,8
+122,9
@@
BUILD_ASSERT_DECL(FLOW_WC_SEQ == 11);
* NXM_NX_REG_W(6) 4 4 4 12
* NXM_NX_REG_W(7) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
* NXM_NX_REG_W(6) 4 4 4 12
* NXM_NX_REG_W(7) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
+ * OXM_OF_METADATA 4 8 8 20
* -------------------------------------------
* -------------------------------------------
- * total 3
3
3
+ * total 3
5
3
*
* So this value is conservative.
*/
*
* So this value is conservative.
*/