diff options
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/addrconf.c | 3 | ||||
-rw-r--r-- | net/ipv6/ndisc.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 764ad37ca070..c79cbff54370 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -4416,8 +4416,7 @@ static void __addrconf_sysctl_unregister(struct ipv6_devconf *p) | |||
4416 | 4416 | ||
4417 | static void addrconf_sysctl_register(struct inet6_dev *idev) | 4417 | static void addrconf_sysctl_register(struct inet6_dev *idev) |
4418 | { | 4418 | { |
4419 | neigh_sysctl_register(idev->dev, idev->nd_parms, NET_IPV6, | 4419 | neigh_sysctl_register(idev->dev, idev->nd_parms, "ipv6", |
4420 | NET_IPV6_NEIGH, "ipv6", | ||
4421 | &ndisc_ifinfo_sysctl_change); | 4420 | &ndisc_ifinfo_sysctl_change); |
4422 | __addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name, | 4421 | __addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name, |
4423 | idev, &idev->cnf); | 4422 | idev, &idev->cnf); |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 2dfec6bb8ada..8bcc4b7db3bf 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -1820,8 +1820,7 @@ int __init ndisc_init(void) | |||
1820 | neigh_table_init(&nd_tbl); | 1820 | neigh_table_init(&nd_tbl); |
1821 | 1821 | ||
1822 | #ifdef CONFIG_SYSCTL | 1822 | #ifdef CONFIG_SYSCTL |
1823 | err = neigh_sysctl_register(NULL, &nd_tbl.parms, NET_IPV6, | 1823 | err = neigh_sysctl_register(NULL, &nd_tbl.parms, "ipv6", |
1824 | NET_IPV6_NEIGH, "ipv6", | ||
1825 | &ndisc_ifinfo_sysctl_change); | 1824 | &ndisc_ifinfo_sysctl_change); |
1826 | if (err) | 1825 | if (err) |
1827 | goto out_unregister_pernet; | 1826 | goto out_unregister_pernet; |