summaryrefslogtreecommitdiff
path: root/include/net/ip_tunnels.h
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2015-07-23 11:08:44 +0300
committerDavid S. Miller <davem@davemloft.net>2015-07-23 11:28:21 +0300
commit045a0fa0c5f5ea0f16c009f924ea579634afbba8 (patch)
tree10037431a845453ca3942ccbe9a8ebb413baa212 /include/net/ip_tunnels.h
parentc5e40ee287db61a79af1746954ee03ebbf1ff8a3 (diff)
downloadlinux-045a0fa0c5f5ea0f16c009f924ea579634afbba8.tar.xz
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 'include/net/ip_tunnels.h')
-rw-r--r--include/net/ip_tunnels.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index d975b3ebd6c7..47984415f5d1 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -311,6 +311,8 @@ static inline int ip_tunnel_collect_metadata(void)
return static_key_false(&ip_tunnel_metadata_cnt);
}
+void __init ip_tunnel_core_init(void);
+
void ip_tunnel_need_metadata(void);
void ip_tunnel_unneed_metadata(void);