X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fnx-match.h;h=c7ee0f8d22430a239c6c0e1f4c56d1c5bc120db2;hb=3e3252fa1d7e057463ddbd66dab84f0d02ef0f1d;hp=64e22c9b57540493c923581fa1dd6e8ffe953447;hpb=6a885fd0589fdfa3b5d05ca3ff4af52b085a1816;p=openvswitch

diff --git a/lib/nx-match.h b/lib/nx-match.h
index 64e22c9b..c7ee0f8d 100644
--- a/lib/nx-match.h
+++ b/lib/nx-match.h
@@ -35,8 +35,9 @@ struct nx_action_reg_move;
  */
 
 int nx_pull_match(struct ofpbuf *, unsigned int match_len, uint16_t priority,
-                  struct cls_rule *);
-int nx_put_match(struct ofpbuf *, const struct cls_rule *);
+                  struct cls_rule *, ovs_be64 *cookie, ovs_be64 *cookie_mask);
+int nx_put_match(struct ofpbuf *, const struct cls_rule *,
+                 ovs_be64 cookie, ovs_be64 cookie_mask);
 
 char *nx_match_to_string(const uint8_t *, unsigned int match_len);
 int nx_match_from_string(const char *, struct ofpbuf *);
@@ -64,7 +65,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);
-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);
@@ -91,8 +91,8 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits)
     return (ntohs(ofs_nbits) & 0x3f) + 1;
 }
 
-/* Upper bound on the length of an nx_match.  The longest nx_match (assuming
- * we implement 4 registers) would be:
+/* Upper bound on the length of an nx_match.  The longest nx_match (an
+ * IPV6 neighbor discovery message using 5 registers) would be:
  *
  *                   header  value  mask  total
  *                   ------  -----  ----  -----
@@ -102,9 +102,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_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_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
@@ -113,13 +117,14 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits)
  *  NXM_NX_REG_W(1)     4       4     4     12
  *  NXM_NX_REG_W(2)     4       4     4     12
  *  NXM_NX_REG_W(3)     4       4     4     12
+ *  NXM_NX_REG_W(4)     4       4     4     12
  *  NXM_NX_TUN_ID_W     4       8     8     20
  *  -------------------------------------------
- *  total                                  237
+ *  total                                  275
  *
  * So this value is conservative.
  */
-#define NXM_MAX_LEN 256
+#define NXM_MAX_LEN 384
 
 /* This is my guess at the length of a "typical" nx_match, for use in
  * predicting space requirements. */