From 323b39e502f78b0a18fcbb679a82facbb6787a74 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 5 Sep 2013 22:19:25 -0700 Subject: [PATCH] ofproto: Support out_group feature when matching on cookie. Found by inspection. Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- ofproto/ofproto.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 03738abfc..e7ee60eeb 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -2982,7 +2982,8 @@ collect_rules_loose(struct ofproto *ofproto, uint8_t table_id, goto exit; } if (rule->flow_cookie == cookie /* Hash collisions possible. */ - && ofproto_rule_has_out_port(rule, out_port)) { + && ofproto_rule_has_out_port(rule, out_port) + && ofproto_rule_has_out_group(rule, out_group)) { list_push_back(rules, &rule->ofproto_node); } } @@ -3064,7 +3065,8 @@ collect_rules_strict(struct ofproto *ofproto, uint8_t table_id, goto exit; } if (rule->flow_cookie == cookie /* Hash collisions possible. */ - && ofproto_rule_has_out_port(rule, out_port)) { + && ofproto_rule_has_out_port(rule, out_port) + && ofproto_rule_has_out_group(rule, out_group)) { list_push_back(rules, &rule->ofproto_node); } } -- 2.47.0