summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2020-08-12 22:26:37 +0200
committerDavid S. Miller <davem@davemloft.net>2020-08-12 22:26:37 +0200
commit9643609423c7667fb748cc3ccff023d761d0ac90 (patch)
treecfb77e696296afc046af86406d3a96a64bf7cbcf
parentnet: accept an empty mask in /sys/class/net/*/queues/rx-*/rps_cpus (diff)
downloadlinux-9643609423c7667fb748cc3ccff023d761d0ac90.tar.xz
linux-9643609423c7667fb748cc3ccff023d761d0ac90.zip
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>
-rw-r--r--net/ipv4/ip_tunnel_core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 5cb30b7aa752..75c6013ff9a4 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;