diff options
author | Ben Pfaff <blp@nicira.com> | 2012-08-07 15:28:18 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2012-09-04 12:24:27 -0700 |
commit | 81a76618be9ea195a1e4a881ba9591728891d10b (patch) | |
tree | 4e87f0e245d09a8b0fb5bc2fe19bf3ae0cb6cbe7 /lib/nx-match.h | |
parent | dbda2960f64238e80570aafeae7af5a752f54f59 (diff) |
classifier: Break cls_rule 'flow' and 'wc' members into new "struct match".
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/nx-match.h')
-rw-r--r-- | lib/nx-match.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/nx-match.h b/lib/nx-match.h index 3bfeeb73..f504ad07 100644 --- a/lib/nx-match.h +++ b/lib/nx-match.h @@ -23,11 +23,9 @@ #include "flow.h" #include "ofp-errors.h" #include "openvswitch/types.h" -#include "ofp-errors.h" -struct cls_rule; struct ds; -struct flow; +struct match; struct mf_subfield; struct ofpact_reg_move; struct ofpact_reg_load; @@ -41,19 +39,16 @@ struct nx_action_reg_move; */ enum ofperr nx_pull_match(struct ofpbuf *, unsigned int match_len, - uint16_t priority, struct cls_rule *, + struct match *, ovs_be64 *cookie, ovs_be64 *cookie_mask); enum ofperr nx_pull_match_loose(struct ofpbuf *, unsigned int match_len, - uint16_t priority, - struct cls_rule *, ovs_be64 *cookie, + struct match *, ovs_be64 *cookie, ovs_be64 *cookie_mask); -enum ofperr oxm_pull_match(struct ofpbuf *, uint16_t priority, - struct cls_rule *); -enum ofperr oxm_pull_match_loose(struct ofpbuf *, uint16_t priority, - struct cls_rule *); -int nx_put_match(struct ofpbuf *, const struct cls_rule *, +enum ofperr oxm_pull_match(struct ofpbuf *, struct match *); +enum ofperr oxm_pull_match_loose(struct ofpbuf *, struct match *); +int nx_put_match(struct ofpbuf *, const struct match *, ovs_be64 cookie, ovs_be64 cookie_mask); -int oxm_put_match(struct ofpbuf *, const struct cls_rule *); +int oxm_put_match(struct ofpbuf *, const struct match *); char *nx_match_to_string(const uint8_t *, unsigned int match_len); char *oxm_match_to_string(const uint8_t *, unsigned int match_len); |