Merge "Disabling GRO when mirroring is enabled" into R3.0

Juniper · May 25, 2016 · f9a5357 · f9a5357
2 parents f3bdaf2 + 0919fd4
commit f9a5357
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/dp-core/vr_mirror.c b/dp-core/vr_mirror.c
@@ -411,6 +411,7 @@ vr_mirror(struct vrouter *router, uint8_t mirror_id,
 
     clone_len += mirror_md_len;
     nh = mirror->mir_nh;
+    pkt->vp_flags &= ~VP_FLAG_GRO;
     pkt = vr_pclone(pkt);
     if (!pkt)
         return 0;

diff --git a/dp-core/vr_nexthop.c b/dp-core/vr_nexthop.c
@@ -1912,7 +1912,8 @@ nh_encap_l2(struct vr_packet *pkt, struct vr_nexthop *nh,
 
     stats = vr_inet_vrf_stats(fmd->fmd_dvrf, pkt->vp_cpu);
 
-    if ((pkt->vp_flags & VP_FLAG_GRO) && vif_is_virtual(vif)) {
+    if ((pkt->vp_flags & VP_FLAG_GRO) && vif_is_virtual(vif) &&
+            (!(vif->vif_flags & VIF_FLAG_MIRROR_TX))) {
         if (vr_gro_input(pkt, nh)) {
             if (stats)
                 stats->vrf_gros++;
@@ -1975,7 +1976,8 @@ nh_encap_l3(struct vr_packet *pkt, struct vr_nexthop *nh,
         }
     }
 
-    if ((pkt->vp_flags & VP_FLAG_GRO) && vif_is_virtual(vif)) {
+    if ((pkt->vp_flags & VP_FLAG_GRO) && vif_is_virtual(vif) &&
+            (!(vif->vif_flags & VIF_FLAG_MIRROR_TX))) {
         if (vr_gro_input(pkt, nh))
             return 0;
     }