mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
net neigh: Decouple per interface neighbour table controls from binary sysctls
Stop computing the number of neighbour table settings we have by counting the number of binary sysctls. This behaviour was silly and meant that we could not add another neighbour table setting without also adding another binary sysctl. Don't pass the binary sysctl path for neighour table entries into neigh_sysctl_register. These parameters are no longer used and so are just dead code. Signed-off-by: Eric W. Biederman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
02291680ff
commit
54716e3beb
7 changed files with 8 additions and 13 deletions
|
|
@ -4416,8 +4416,7 @@ static void __addrconf_sysctl_unregister(struct ipv6_devconf *p)
|
|||
|
||||
static void addrconf_sysctl_register(struct inet6_dev *idev)
|
||||
{
|
||||
neigh_sysctl_register(idev->dev, idev->nd_parms, NET_IPV6,
|
||||
NET_IPV6_NEIGH, "ipv6",
|
||||
neigh_sysctl_register(idev->dev, idev->nd_parms, "ipv6",
|
||||
&ndisc_ifinfo_sysctl_change);
|
||||
__addrconf_sysctl_register(dev_net(idev->dev), idev->dev->name,
|
||||
idev, &idev->cnf);
|
||||
|
|
|
|||
|
|
@ -1820,8 +1820,7 @@ int __init ndisc_init(void)
|
|||
neigh_table_init(&nd_tbl);
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
err = neigh_sysctl_register(NULL, &nd_tbl.parms, NET_IPV6,
|
||||
NET_IPV6_NEIGH, "ipv6",
|
||||
err = neigh_sysctl_register(NULL, &nd_tbl.parms, "ipv6",
|
||||
&ndisc_ifinfo_sysctl_change);
|
||||
if (err)
|
||||
goto out_unregister_pernet;
|
||||
|
|
|
|||
Loading…
Reference in a new issue