OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e0d8fe
)
Revert "ipv4: tunnel: fix compilation on ARCH=um"
author
David S. Miller
<davem@davemloft.net>
Wed, 12 Aug 2020 20:26:37 +0000
(13:26 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 12 Aug 2020 20:26:37 +0000
(13:26 -0700)
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>
net/ipv4/ip_tunnel_core.c
patch
|
blob
|
history
diff --git
a/net/ipv4/ip_tunnel_core.c
b/net/ipv4/ip_tunnel_core.c
index
5cb30b7
..
75c6013
100644
(file)
--- 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;