projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sFlow: add Sun Industry Standards Source License 1.1 as licensing option
[openvswitch]
/
lib
/
nx-match.h
diff --git
a/lib/nx-match.h
b/lib/nx-match.h
index fbb8946baeec59e12efa19980b5f410acdd6afc1..faeacd6c859c0fbb717de7bb7031d7005e2039ad 100644
(file)
--- a/
lib/nx-match.h
+++ b/
lib/nx-match.h
@@
-64,7
+64,6
@@
void nxm_reg_load(ovs_be32 dst, ovs_be16 ofs_nbits, uint64_t src_data,
int nxm_field_bytes(uint32_t header);
int nxm_field_bits(uint32_t header);
int nxm_field_bytes(uint32_t header);
int nxm_field_bits(uint32_t header);
-const struct mf_field *nxm_field_to_mf_field(uint32_t header);
const char *nxm_parse_field_bits(const char *s,
uint32_t *headerp, int *ofsp, int *n_bitsp);
const char *nxm_parse_field_bits(const char *s,
uint32_t *headerp, int *ofsp, int *n_bitsp);
@@
-102,10
+101,13
@@
nxm_decode_n_bits(ovs_be16 ofs_nbits)
* NXM_OF_ETH_TYPE 4 2 -- 6
* NXM_OF_VLAN_TCI 4 2 2 8
* NXM_OF_IP_TOS 4 1 -- 5
* NXM_OF_ETH_TYPE 4 2 -- 6
* NXM_OF_VLAN_TCI 4 2 2 8
* NXM_OF_IP_TOS 4 1 -- 5
+ * NXM_NX_IP_ECN 4 1 -- 5
+ * NXM_OF_IP_TTL 4 1 -- 5
* NXM_NX_IP_FRAG 4 1 1 8
* NXM_OF_IP_PROTO 4 2 -- 6
* NXM_OF_IPV6_SRC_W 4 16 16 36
* NXM_OF_IPV6_DST_W 4 16 16 36
* NXM_NX_IP_FRAG 4 1 1 8
* NXM_OF_IP_PROTO 4 2 -- 6
* NXM_OF_IPV6_SRC_W 4 16 16 36
* NXM_OF_IPV6_DST_W 4 16 16 36
+ * 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_OF_ICMP_TYPE 4 1 -- 5
* NXM_OF_ICMP_CODE 4 1 -- 5
* NXM_NX_ND_TARGET 4 16 -- 20
@@
-117,7
+119,7
@@
nxm_decode_n_bits(ovs_be16 ofs_nbits)
* NXM_NX_REG_W(4) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
* -------------------------------------------
* NXM_NX_REG_W(4) 4 4 4 12
* NXM_NX_TUN_ID_W 4 8 8 20
* -------------------------------------------
- * total 2
57
+ * total 2
75
*
* So this value is conservative.
*/
*
* So this value is conservative.
*/