From de5a23fdbc34927af7d0cf7571ce67b0fd31b234 Mon Sep 17 00:00:00 2001
From: Ganesan Prabhakaran <gprabhak@juniper.net>
Date: Mon, 20 Oct 2014 13:06:44 -0700
Subject: [PATCH] Disable GSO on vhost interface to fix vrouter crash

Already fixed in mainline. Checking in the fix to 1.30

Change-Id: Icee7a695eb9330a77bcb06fc5a719dd0d526763c
Closes-bug: 1379240
---
 linux/vhost_dev.c         | 1 -
 linux/vr_host_interface.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/linux/vhost_dev.c b/linux/vhost_dev.c
index 7c751a0ff..f2f8f7968 100644
--- a/linux/vhost_dev.c
+++ b/linux/vhost_dev.c
@@ -225,7 +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 =
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;