Merge branch 'iov_iter' into for-davem-2

[karo-tx-linux.git] / net / mpls / mpls_gso.c

diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c
index e3545f21a099b01b931cd863205a847acd336238..ca27837974fedd82fffcd9c91aa565c60534b13c 100644 (file)
--- a/net/mpls/mpls_gso.c
+++ b/net/mpls/mpls_gso.c
@@ -34,8 +34,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb,
                                  SKB_GSO_TCP_ECN |
                                  SKB_GSO_GRE |
                                  SKB_GSO_GRE_CSUM |
-                                 SKB_GSO_IPIP |
-                                 SKB_GSO_MPLS)))
+                                 SKB_GSO_IPIP)))
                goto out;
 
        /* Setup inner SKB. */