From: Ben Pfaff <blp@nicira.com>
Date: Fri, 6 Sep 2013 05:19:25 +0000 (-0700)
Subject: ofproto: Support out_group feature when matching on cookie.
X-Git-Tag: sliver-openvswitch-2.0.90-1~15^2~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=323b39e502f78b0a18fcbb679a82facbb6787a74;p=sliver-openvswitch.git

ofproto: Support out_group feature when matching on cookie.

Found by inspection.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

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);
                 }
             }