Commit 045a0fa0 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller

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: 3093fbe7 ("route: Per route IP tunnel metadata via lightweight tunnel")
Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5e40ee2
...@@ -311,6 +311,8 @@ static inline int ip_tunnel_collect_metadata(void) ...@@ -311,6 +311,8 @@ static inline int ip_tunnel_collect_metadata(void)
return static_key_false(&ip_tunnel_metadata_cnt); return static_key_false(&ip_tunnel_metadata_cnt);
} }
void __init ip_tunnel_core_init(void);
void ip_tunnel_need_metadata(void); void ip_tunnel_need_metadata(void);
void ip_tunnel_unneed_metadata(void); void ip_tunnel_unneed_metadata(void);
......
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
#include <net/raw.h> #include <net/raw.h>
#include <net/icmp.h> #include <net/icmp.h>
#include <net/inet_common.h> #include <net/inet_common.h>
#include <net/ip_tunnels.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
#include <net/secure_seq.h> #include <net/secure_seq.h>
...@@ -1780,6 +1781,8 @@ static int __init inet_init(void) ...@@ -1780,6 +1781,8 @@ static int __init inet_init(void)
dev_add_pack(&ip_packet_type); dev_add_pack(&ip_packet_type);
ip_tunnel_core_init();
rc = 0; rc = 0;
out: out:
return rc; return rc;
......
...@@ -292,19 +292,10 @@ static const struct lwtunnel_encap_ops ip_tun_lwt_ops = { ...@@ -292,19 +292,10 @@ static const struct lwtunnel_encap_ops ip_tun_lwt_ops = {
.get_encap_size = ip_tun_encap_nlsize, .get_encap_size = ip_tun_encap_nlsize,
}; };
static int __init ip_tunnel_core_init(void) void __init ip_tunnel_core_init(void)
{ {
lwtunnel_encap_add_ops(&ip_tun_lwt_ops, LWTUNNEL_ENCAP_IP); lwtunnel_encap_add_ops(&ip_tun_lwt_ops, LWTUNNEL_ENCAP_IP);
return 0;
}
module_init(ip_tunnel_core_init);
static void __exit ip_tunnel_core_exit(void)
{
lwtunnel_encap_del_ops(&ip_tun_lwt_ops, LWTUNNEL_ENCAP_IP);
} }
module_exit(ip_tunnel_core_exit);
struct static_key ip_tunnel_metadata_cnt = STATIC_KEY_INIT_FALSE; struct static_key ip_tunnel_metadata_cnt = STATIC_KEY_INIT_FALSE;
EXPORT_SYMBOL(ip_tunnel_metadata_cnt); EXPORT_SYMBOL(ip_tunnel_metadata_cnt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment