ofproto-dpif-xlate: Add xlate_normal_flood()

This is also needed for multicast snooping.

Acked-by: Thomas Graf <tgraf@redhat.com>
Acked-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 86566ad..a87db54 100644 (file)
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -1481,6 +1481,23 @@ update_learning_table(const struct xbridge *xbridge,
     }
 }
 
+static void
+xlate_normal_flood(struct xlate_ctx *ctx, struct xbundle *in_xbundle,
+                   uint16_t vlan)
+{
+    struct xbundle *xbundle;
+
+    LIST_FOR_EACH (xbundle, list_node, &ctx->xbridge->xbundles) {
+        if (xbundle != in_xbundle
+            && xbundle_includes_vlan(xbundle, vlan)
+            && xbundle->floodable
+            && !xbundle_mirror_out(ctx->xbridge, xbundle)) {
+            output_normal(ctx, xbundle, vlan);
+        }
+    }
+    ctx->xout->nf_output_iface = NF_OUT_FLOOD;
+}
+
 static void
 xlate_normal(struct xlate_ctx *ctx)
 {
@@ -1575,18 +1592,8 @@ xlate_normal(struct xlate_ctx *ctx)
             xlate_report(ctx, "learned port is input port, dropping");
         }
     } else {
-        struct xbundle *xbundle;
-
         xlate_report(ctx, "no learned MAC for destination, flooding");
-        LIST_FOR_EACH (xbundle, list_node, &ctx->xbridge->xbundles) {
-            if (xbundle != in_xbundle
-                && xbundle_includes_vlan(xbundle, vlan)
-                && xbundle->floodable
-                && !xbundle_mirror_out(ctx->xbridge, xbundle)) {
-                output_normal(ctx, xbundle, vlan);
-            }
-        }
-        ctx->xout->nf_output_iface = NF_OUT_FLOOD;
+        xlate_normal_flood(ctx, in_xbundle, vlan);
     }
 }