Merge "Do not reuse forwarding metadata post mirroring" into R2.21.x

Juniper · Mar 25, 2016 · ab0cbac · ab0cbac
2 parents 5d564a3 + 56611ab
commit ab0cbac
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/dp-core/vr_datapath.c b/dp-core/vr_datapath.c
@@ -550,7 +550,7 @@ unsigned int
 vr_virtual_input(unsigned short vrf, struct vr_interface *vif,
                  struct vr_packet *pkt, unsigned short vlan_id)
 {
-    struct vr_forwarding_md fmd;
+    struct vr_forwarding_md fmd, mfmd;
 
     vr_init_forwarding_md(&fmd);
     fmd.fmd_vlan = vlan_id;
@@ -562,8 +562,9 @@ vr_virtual_input(unsigned short vrf, struct vr_interface *vif,
     }
 
     if (vif->vif_flags & VIF_FLAG_MIRROR_RX) {
-        fmd.fmd_dvrf = vif->vif_vrf;
-        vr_mirror(vif->vif_router, vif->vif_mirror_id, pkt, &fmd);
+        mfmd = fmd;
+        mfmd.fmd_dvrf = vif->vif_vrf;
+        vr_mirror(vif->vif_router, vif->vif_mirror_id, pkt, &mfmd);
     }
 
     /*