Merge branch 'mainstream'

[sliver-openvswitch.git] / datapath / linux / compat / ip_tunnels_core.c

diff --git a/datapath/linux/compat/ip_tunnels_core.c b/datapath/linux/compat/ip_tunnels_core.c
index 01cc2fb..66d5e02 100644 (file)
--- a/datapath/linux/compat/ip_tunnels_core.c
+++ b/datapath/linux/compat/ip_tunnels_core.c
@@ -31,11 +31,10 @@
 #include <net/route.h>
 #include <net/xfrm.h>
 
-#include "checksum.h"
 #include "compat.h"
 #include "gso.h"
 
-int iptunnel_xmit(struct net *net, struct rtable *rt,
+int iptunnel_xmit(struct rtable *rt,
                  struct sk_buff *skb,
                  __be32 src, __be32 dst, __u8 proto,
                  __u8 tos, __u8 ttl, __be16 df)
@@ -100,9 +99,6 @@ int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto)
                skb->protocol = inner_proto;
        }
 
-       if (unlikely(compute_ip_summed(skb, false)))
-               return -EPROTO;
-
        nf_reset(skb);
        secpath_reset(skb);
        skb_clear_rxhash(skb);