From 40144c591ad9bebe2ad56e9ed433bef16fa3f9c3 Mon Sep 17 00:00:00 2001
From: Raja Sivaramakrishnan <raja@juniper.net>
Date: Mon, 13 Oct 2014 13:29:21 -0700
Subject: [PATCH] Disable GSO on vhost0 as there are issues with agent restart
 (due to a vrouter issue which results in skb gso_size being reset to 0 when
 packets are trapped to the agent)

Fixes bug 1379240

Change-Id: If09c0c24a48a93e9463abd175993d99cecd4ecf2
---
 linux/vhost_dev.c         | 2 --
 linux/vr_host_interface.c | 1 -
 2 files changed, 3 deletions(-)

diff --git a/linux/vhost_dev.c b/linux/vhost_dev.c
index 7c751a0ff..65ab3cf70 100644
--- a/linux/vhost_dev.c
+++ b/linux/vhost_dev.c
@@ -225,8 +225,6 @@ vhost_if_add(struct vr_interface *vif)
 
     vp->vp_vifp = vif;
     if (vif->vif_type == VIF_TYPE_HOST) {
-        dev->features |= (NETIF_F_GSO | NETIF_F_TSO | NETIF_F_SG | NETIF_F_IP_CSUM);
-
         if (vif->vif_bridge) {
             vp->vp_phys_dev =
                 (struct net_device *)vif->vif_bridge->vif_os;
diff --git a/linux/vr_host_interface.c b/linux/vr_host_interface.c
index ffc218509..5318ffb60 100644
--- a/linux/vr_host_interface.c
+++ b/linux/vr_host_interface.c
@@ -941,7 +941,6 @@ linux_to_vr(struct vr_interface *vif, struct sk_buff *skb)
     if (!pkt)
         return 0;
 
-    pkt->vp_flags |= VP_FLAG_GSO;
     vif->vif_rx(vif, pkt, VLAN_ID_INVALID);
 
     return 0;