Merge "Closes-Bug: #1380904. Treat Vlan tagged IP packets from VM as …

…L2 packets. L3 well know packets and ARP packets are not processed any more in L3 block and are subjected to L2 looksup so that they are L2 bridged" into R1.30
Juniper · Oct 25, 2014 · 18e1c3f · 18e1c3f
2 parents 382aac7 + d1c30b3
commit 18e1c3f
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/dp-core/vr_datapath.c b/dp-core/vr_datapath.c
@@ -443,11 +443,16 @@ vr_l2_input(unsigned short vrf, struct vr_packet *pkt,
     int reason;
     struct vr_interface *vif = pkt->vp_if;
 
-    if (IS_MAC_BMCAST(pkt_data(pkt)) &&
-        (vif->vif_flags & VIF_FLAG_L3_ENABLED)) {
-        if (pkt->vp_type == VP_TYPE_ARP || vr_l3_well_known_packet(vrf, pkt))
-            if (vr_l3_input(vrf, pkt, fmd))
-                return 1;
+    /* Only non-vlan tagged are L3 packets */
+    if (fmd->fmd_vlan == VLAN_ID_INVALID) {
+        if (IS_MAC_BMCAST(pkt_data(pkt)) &&
+                (vif->vif_flags & VIF_FLAG_L3_ENABLED)) {
+            if (pkt->vp_type == VP_TYPE_ARP || 
+                    vr_l3_well_known_packet(vrf, pkt)) {
+                if (vr_l3_input(vrf, pkt, fmd))
+                    return 1;
+            }
+        }
     }
 
     if (!(vif->vif_flags & VIF_FLAG_L2_ENABLED))