This is a backport of the facet wildcarding code to 1.11. The patch that should be the most closely looked at is "ofproto-dpif: Consolidate facet stat logic.", since I had to modify the facet_flush_stats() and rule_get_stats() to prevent double-counting. The others were very straight-forward.
Ethan Jackson (4): ofproto-dpif: Consolidate facet stat logic. flow: Add new flow_wildcards_fold_minimask() function. classifier: Add 'wc' argument to classifier_lookup(). flow: Add new wildcard functions. Justin Pettit (1): ofproto-dpif: Store relevant fields for wildcarding in facet. NEWS | 2 + lib/bond.c | 20 ++- lib/bond.h | 5 +- lib/bundle.c | 19 +- lib/bundle.h | 2 + lib/classifier.c | 17 +- lib/classifier.h | 3 +- lib/flow.c | 117 +++++++-- lib/flow.h | 17 +- lib/learn.c | 16 ++ lib/learn.h | 2 + lib/multipath.c | 7 +- lib/multipath.h | 4 +- lib/nx-match.c | 13 +- lib/nx-match.h | 6 +- ofproto/ofproto-dpif.c | 672 +++++++++++++++++++++++++++++++---------------- tests/ofproto-dpif.at | 379 ++++++++++++++++++++++++++ tests/test-bundle.c | 4 +- tests/test-classifier.c | 4 +- tests/test-multipath.c | 5 +- 20 files changed, 1032 insertions(+), 282 deletions(-) -- 1.7.5.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev