From: Sabrina Dubroca <sd@queasysnail.net>
Date: Thu, 16 Jul 2020 08:09:03 +0000 (+0200)
Subject: xfrm: policy: fix IPv6-only espintcp compilation
X-Git-Tag: v5.8~4^2~2^2~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95a35b42bc6e5d8ce7baff8aefed10e9829e7ae5;p=thirdparty%2Flinux.git

xfrm: policy: fix IPv6-only espintcp compilation

In case we're compiling espintcp support only for IPv6, we should
still initialize the common code.

Fixes: 26333c37fc28 ("xfrm: add IPv6 support for espintcp")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index 6847b3579f541..19c5e0fa3f44d 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -39,7 +39,7 @@
 #ifdef CONFIG_XFRM_STATISTICS
 #include <net/snmp.h>
 #endif
-#ifdef CONFIG_INET_ESPINTCP
+#ifdef CONFIG_XFRM_ESPINTCP
 #include <net/espintcp.h>
 #endif
 
@@ -4149,7 +4149,7 @@ void __init xfrm_init(void)
 	seqcount_init(&xfrm_policy_hash_generation);
 	xfrm_input_init();
 
-#ifdef CONFIG_INET_ESPINTCP
+#ifdef CONFIG_XFRM_ESPINTCP
 	espintcp_init();
 #endif