projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
ip6_tunnel.h
diff --git
a/include/net/ip6_tunnel.h
b/include/net/ip6_tunnel.h
index ebdef7f60862586dede971ec26c8c25f995838ee..4da5de10d1d49f62bbbe33e770e4c95f2b5c9ddd 100644
(file)
--- a/
include/net/ip6_tunnel.h
+++ b/
include/net/ip6_tunnel.h
@@
-3,6
+3,7
@@
#include <linux/ipv6.h>
#include <linux/netdevice.h>
+#include <linux/if_tunnel.h>
#include <linux/ip6_tunnel.h>
#define IP6TUNNEL_ERR_TIMEO (30*HZ)