summaryrefslogtreecommitdiff
path: root/tests/test-classifier.c
diff options
context:
space:
mode:
authorEthan Jackson <ethan@nicira.com>2013-06-10 22:48:58 -0700
committerJustin Pettit <jpettit@nicira.com>2013-06-11 13:03:50 -0700
commit368eefac37c490ad4f63e5d40deb94c724cf25c5 (patch)
treec43d237167efd2f25141725fb96c1a712e29165d /tests/test-classifier.c
parent74f74083e6cb8c771cccf33cbce70b565cca9449 (diff)
downloadopenvswitch-368eefac37c490ad4f63e5d40deb94c724cf25c5.tar.gz
flow: Add new wildcard functions.
Rename the function flow_wildcards_combine() to flow_wildcards_and(). Add new flow_wildcards_or() and flow_hash_in_wildcards() functions. These will be useful in a future patch. Signed-off-by: Ethan Jackson <ethan@nicira.com> Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'tests/test-classifier.c')
-rw-r--r--tests/test-classifier.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-classifier.c b/tests/test-classifier.c
index da7bdcba8..f6164947b 100644
--- a/tests/test-classifier.c
+++ b/tests/test-classifier.c
@@ -1279,7 +1279,7 @@ test_minimask_combine(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
minimask_init(&minimask2, &mask2);
minimask_combine(&minicombined, &minimask, &minimask2, storage);
- flow_wildcards_combine(&combined, &mask, &mask2);
+ flow_wildcards_and(&combined, &mask, &mask2);
minimask_expand(&minicombined, &combined2);
assert(flow_wildcards_equal(&combined, &combined2));