From: David S. Miller <davem@davemloft.net>
Date: Wed, 12 Aug 2020 20:26:37 +0000 (-0700)
Subject: Revert "ipv4: tunnel: fix compilation on ARCH=um"
X-Git-Tag: v5.10.7~1846^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9643609423c7667fb748cc3ccff023d761d0ac90;p=platform%2Fkernel%2Flinux-rpi.git

Revert "ipv4: tunnel: fix compilation on ARCH=um"

This reverts commit 06a7a37be55e29961c9ba2abec4d07c8e0e21861.

The bug was already fixed, this added a dup include.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 5cb30b7..75c6013 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -38,7 +38,6 @@
 #include <net/geneve.h>
 #include <net/vxlan.h>
 #include <net/erspan.h>
-#include <net/ip6_checksum.h>
 
 const struct ip_tunnel_encap_ops __rcu *
 		iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly;