summaryrefslogtreecommitdiffstats
path: root/net/ipv6/addrconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r--net/ipv6/addrconf.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 44340ff82da5..0e7135a206b0 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -6693,20 +6693,19 @@ void addrconf_disable_policy_idev(struct inet6_dev *idev, int val)
static
int addrconf_disable_policy(struct ctl_table *ctl, int *valp, int val)
{
+ struct net *net = (struct net *)ctl->extra2;
struct inet6_dev *idev;
- struct net *net;
+
+ if (valp == &net->ipv6.devconf_dflt->disable_policy) {
+ WRITE_ONCE(*valp, val);
+ return 0;
+ }
if (!rtnl_trylock())
return restart_syscall();
WRITE_ONCE(*valp, val);
- net = (struct net *)ctl->extra2;
- if (valp == &net->ipv6.devconf_dflt->disable_policy) {
- rtnl_unlock();
- return 0;
- }
-
if (valp == &net->ipv6.devconf_all->disable_policy) {
struct net_device *dev;