[PATCH] ipv6: Create module parameter for use_tempaddr
flat view
STALE5510d
From: Paul Stewart <hidden>
Date: 2011-09-01 06:27:56
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
When ipv6 is used as a module, there is no good place to set the default value for use_tempaddr. Using sysctl.conf will set this parameter too early -- before the module is loaded. To solve this, create a module parameter that will set the default value of use_tempaddr for all devices. Signed-off-by: Paul Stewart <redacted> --- include/linux/ipv6.h | 1 + net/ipv6/addrconf.c | 3 +++ net/ipv6/af_inet6.c | 8 ++++++++ 3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 0c99776..0d45a7c 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h@@ -178,6 +178,7 @@ struct ipv6_devconf { struct ipv6_params { __s32 disable_ipv6; __s32 autoconf; + __s32 use_tempaddr; }; extern struct ipv6_params ipv6_defaults; #endif
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index f012ebd..27314a2 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c@@ -4609,6 +4609,9 @@ static int __net_init addrconf_init_net(struct net *net) /* these will be inherited by all namespaces */ dflt->autoconf = ipv6_defaults.autoconf; dflt->disable_ipv6 = ipv6_defaults.disable_ipv6; +#ifdef CONFIG_IPV6_PRIVACY + dflt->use_tempaddr = ipv6_defaults.use_tempaddr; +#endif } net->ipv6.devconf_all = all;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 3b5669a..5022950 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c@@ -76,6 +76,9 @@ static DEFINE_SPINLOCK(inetsw6_lock); struct ipv6_params ipv6_defaults = { .disable_ipv6 = 0, .autoconf = 1, +#ifdef CONFIG_IPV6_PRIVACY + .use_tempaddr = 0, +#endif }; static int disable_ipv6_mod = 0;
@@ -89,6 +92,11 @@ MODULE_PARM_DESC(disable_ipv6, "Disable IPv6 on all interfaces"); module_param_named(autoconf, ipv6_defaults.autoconf, int, 0444); MODULE_PARM_DESC(autoconf, "Enable IPv6 address autoconfiguration on all interfaces"); +#ifdef CONFIG_IPV6_PRIVACY +module_param_named(use_tempaddr, ipv6_defaults.use_tempaddr, int, 0444); +MODULE_PARM_DESC(use_tempaddr, "Enable IPv6 address privacy for autoconfiguration by default"); +#endif + static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) { const int offset = sk->sk_prot->obj_size - sizeof(struct ipv6_pinfo);
--
1.7.3.1