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

diff --git a/lib/nx-match.h b/lib/nx-match.h
index 6a33dbe4..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);
@@ -103,6 +103,7 @@ nxm_decode_n_bits(ovs_be16 ofs_nbits)
  *  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
@@ -119,7 +120,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
  *  -------------------------------------------
- *  total                                  270
+ *  total                                  275
  *
  * So this value is conservative.
  */