diff options
| author | Thomas Graf <tgraf@suug.ch> | 2015-07-23 10:08:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-23 10:28:21 +0200 |
| commit | 045a0fa0c5f5ea0f16c009f924ea579634afbba8 (patch) | |
| tree | 10037431a845453ca3942ccbe9a8ebb413baa212 /net/ipv4/af_inet.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-045a0fa0c5f5ea0f16c009f924ea579634afbba8.tar.xz linux-045a0fa0c5f5ea0f16c009f924ea579634afbba8.zip | |
ip_tunnel: Call ip_tunnel_core_init() from inet_init()
Convert the module_init() to a invocation from inet_init() since
ip_tunnel_core is part of the INET built-in.
Fixes: 3093fbe7ff4 ("route: Per route IP tunnel metadata via lightweight tunnel")
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 9532ee87151f..cc4e498a0ccf 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -112,6 +112,7 @@ #include <net/raw.h> #include <net/icmp.h> #include <net/inet_common.h> +#include <net/ip_tunnels.h> #include <net/xfrm.h> #include <net/net_namespace.h> #include <net/secure_seq.h> @@ -1780,6 +1781,8 @@ static int __init inet_init(void) dev_add_pack(&ip_packet_type); + ip_tunnel_core_init(); + rc = 0; out: return rc; |