Remove unused cls_rule_hash() and minimatch_hash() functions.
Signed-off-by: Jarno Rajahalme <jrajaha...@nicira.com>
---
lib/classifier-private.h | 7 -------
lib/classifier.c | 7 -------
lib/classifier.h | 1 -
3 files changed, 15 deletions(-)
diff --git a/lib/classifier-private.h b/lib/classifier-private.h
index cc255fe..0fd58e4 100644
--- a/lib/classifier-private.h
+++ b/lib/classifier-private.h
@@ -378,13 +378,6 @@ minimask_hash(const struct minimask *mask, uint32_t basis)
return miniflow_hash(&mask->masks, basis);
}
-/* Returns a hash value for 'match', given 'basis'. */
-static inline uint32_t
-minimatch_hash(const struct minimatch *match, uint32_t basis)
-{
- return miniflow_hash(match->flow, minimask_hash(match->mask, basis));
-}
-
/* Returns a hash value for the bits of range [start, end) in 'minimatch',
* given 'basis'.
*
diff --git a/lib/classifier.c b/lib/classifier.c
index f30f1ab..4adee2d 100644
--- a/lib/classifier.c
+++ b/lib/classifier.c
@@ -262,13 +262,6 @@ cls_rule_equal(const struct cls_rule *a, const struct
cls_rule *b)
return a->priority == b->priority && minimatch_equal(&a->match, &b->match);
}
-/* Returns a hash value for 'rule', folding in 'basis'. */
-uint32_t
-cls_rule_hash(const struct cls_rule *rule, uint32_t basis)
-{
- return minimatch_hash(&rule->match, hash_int(rule->priority, basis));
-}
-
/* Appends a string describing 'rule' to 's'. */
void
cls_rule_format(const struct cls_rule *rule, struct ds *s)
diff --git a/lib/classifier.h b/lib/classifier.h
index 5ffe756..889dc1e 100644
--- a/lib/classifier.h
+++ b/lib/classifier.h
@@ -372,7 +372,6 @@ void cls_rule_set_conjunctions(struct cls_rule *,
const struct cls_conjunction *, size_t n);
bool cls_rule_equal(const struct cls_rule *, const struct cls_rule *);
-uint32_t cls_rule_hash(const struct cls_rule *, uint32_t basis);
void cls_rule_format(const struct cls_rule *, struct ds *);
bool cls_rule_is_catchall(const struct cls_rule *);
bool cls_rule_is_loose_match(const struct cls_rule *rule,
--
2.1.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
