From: Pravin B Shelar <pshelar@nicira.com>
Date: Wed, 24 Dec 2014 00:20:16 +0000 (-0800)
Subject: mpls: Fix allowed protocols for mpls gso
X-Git-Tag: v3.19-rc3~16^2~16^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cc1beca3096a6425543cb83a61665b9c8040f98;p=platform%2Fkernel%2Flinux-stable.git

mpls: Fix allowed protocols for mpls gso

MPLS and Tunnel GSO does not work together.  Reject packet which
request such GSO.

Fixes: 0d89d2035f ("MPLS: Add limited GSO support").
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c
index ca27837..349295d 100644
--- a/net/mpls/mpls_gso.c
+++ b/net/mpls/mpls_gso.c
@@ -31,10 +31,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
 				  SKB_GSO_TCPV6 |
 				  SKB_GSO_UDP |
 				  SKB_GSO_DODGY |
-				  SKB_GSO_TCP_ECN |
-				  SKB_GSO_GRE |
-				  SKB_GSO_GRE_CSUM |
-				  SKB_GSO_IPIP)))
+				  SKB_GSO_TCP_ECN)))
 		goto out;
 
 	/* Setup inner SKB. */