Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ipv6: move the disable_ipv6_mod knob to core code
From: Jakub Kicinski <kuba@kernel.org>
Make sure disable_ipv6_mod itself is not part of the IPv6 module,
in case core code wants to refer to it. We will remove support
for IPv6=m soon, this change helps make fixes we commit before
that less messy.
Link: https://patch.msgid.link/20260307-net-nd_tbl_fixes-v4-1-e2677e85628c@suse.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+12
-9
+6
-1
include/linux/ipv6.h
+6
-1
include/linux/ipv6.h
···
333
333
};
334
334
335
335
#if IS_ENABLED(CONFIG_IPV6)
336
-
bool ipv6_mod_enabled(void);
336
+
extern int disable_ipv6_mod;
337
+
338
+
static inline bool ipv6_mod_enabled(void)
339
+
{
340
+
return disable_ipv6_mod == 0;
341
+
}
337
342
338
343
static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk)
339
344
{
+6
net/ipv4/af_inet.c
+6
net/ipv4/af_inet.c
···
124
124
125
125
#include <trace/events/sock.h>
126
126
127
+
/* Keep the definition of IPv6 disable here for now, to avoid annoying linker
128
+
* issues in case IPv6=m
129
+
*/
130
+
int disable_ipv6_mod;
131
+
EXPORT_SYMBOL(disable_ipv6_mod);
132
+
127
133
/* The inetsw table contains everything that inet_create needs to
128
134
* build a new socket.
129
135
*/
-8
net/ipv6/af_inet6.c
-8
net/ipv6/af_inet6.c
···
86
86
.autoconf = 1,
87
87
};
88
88
89
-
static int disable_ipv6_mod;
90
-
91
89
module_param_named(disable, disable_ipv6_mod, int, 0444);
92
90
MODULE_PARM_DESC(disable, "Disable IPv6 module such that it is non-functional");
93
91
···
94
96
95
97
module_param_named(autoconf, ipv6_defaults.autoconf, int, 0444);
96
98
MODULE_PARM_DESC(autoconf, "Enable IPv6 address autoconfiguration on all interfaces");
97
-
98
-
bool ipv6_mod_enabled(void)
99
-
{
100
-
return disable_ipv6_mod == 0;
101
-
}
102
-
EXPORT_SYMBOL_GPL(ipv6_mod_enabled);
103
99
104
100
static struct ipv6_pinfo *inet6_sk_generic(struct sock *sk)
105
101
{