X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fmatch.h;h=6e87a096d480117c80669aee42328b1e228a623d;hb=2431be1b68d386bd616378d2c528242775c4d54a;hp=7b104ee128a8715853832386bbc775f96fc8f896;hpb=b2c1f00b730c3b92e8c1ff37b7d0f8c7a9a44934;p=sliver-openvswitch.git

diff --git a/lib/match.h b/lib/match.h
index 7b104ee12..6e87a096d 100644
--- a/lib/match.h
+++ b/lib/match.h
@@ -38,7 +38,6 @@ void match_init(struct match *,
                 const struct flow *, const struct flow_wildcards *);
 void match_wc_init(struct match *match, const struct flow *flow);
 void match_init_catchall(struct match *);
-void match_init_exact(struct match *, const struct flow *);
 
 void match_zero_wildcarded_fields(struct match *);
 
@@ -132,13 +131,15 @@ void match_print(const struct match *);
 
 /* A sparse representation of a "struct match".
  *
- * This has the same invariant as "struct match", that is, a 1-bit in the
- * 'flow' must correspond to a 1-bit in 'mask'.
+ * There are two invariants:
  *
- * The invariants for the underlying miniflow and minimask are also maintained,
- * which means that 'flow' and 'mask' can have different 'map's.  In
- * particular, if the match checks that a given 32-bit field has value 0, then
- * 'map' will have a 1-bit in 'mask' but a 0-bit in 'flow' for that field. */
+ *   - The same invariant as "struct match", that is, a 1-bit in the 'flow'
+ *     must correspond to a 1-bit in 'mask'.
+ *
+ *   - 'flow' and 'mask' have the same 'map'.  This implies that 'flow' and
+ *     'mask' have the same part of "struct flow" at the same offset into
+ *     'values', which makes minimatch_matches_flow() faster.
+ */
 struct minimatch {
     struct miniflow flow;
     struct minimask mask;
@@ -154,6 +155,8 @@ void minimatch_expand(const struct minimatch *, struct match *);
 bool minimatch_equal(const struct minimatch *a, const struct minimatch *b);
 uint32_t minimatch_hash(const struct minimatch *, uint32_t basis);
 
+bool minimatch_matches_flow(const struct minimatch *, const struct flow *);
+
 void minimatch_format(const struct minimatch *, struct ds *,
                       unsigned int priority);
 char *minimatch_to_string(const struct minimatch *, unsigned int priority);