diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2014-11-10 18:59:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-11 15:23:54 -0500 |
commit | d7480fd3b1738a8eae6a76098b17af318cf9b9cc (patch) | |
tree | 559ba1e8e583fec97c223f31b3657023e71febfb /net/ipv6/ndisc.c | |
parent | b2e2f0c779fefede3a871781c8827bd8e76c7c0f (diff) |
neigh: remove dynamic neigh table registration support
Currently there are only three neigh tables in the whole kernel:
arp table, ndisc table and decnet neigh table. What's more,
we don't support registering multiple tables per family.
Therefore we can just make these tables statically built-in.
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 4cb45c1079a2..2c9f6bf57325 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -1763,7 +1763,7 @@ int __init ndisc_init(void) | |||
1763 | /* | 1763 | /* |
1764 | * Initialize the neighbour table | 1764 | * Initialize the neighbour table |
1765 | */ | 1765 | */ |
1766 | neigh_table_init(&nd_tbl); | 1766 | neigh_table_init(NEIGH_ND_TABLE, &nd_tbl); |
1767 | 1767 | ||
1768 | #ifdef CONFIG_SYSCTL | 1768 | #ifdef CONFIG_SYSCTL |
1769 | err = neigh_sysctl_register(NULL, &nd_tbl.parms, | 1769 | err = neigh_sysctl_register(NULL, &nd_tbl.parms, |
@@ -1796,6 +1796,6 @@ void ndisc_cleanup(void) | |||
1796 | #ifdef CONFIG_SYSCTL | 1796 | #ifdef CONFIG_SYSCTL |
1797 | neigh_sysctl_unregister(&nd_tbl.parms); | 1797 | neigh_sysctl_unregister(&nd_tbl.parms); |
1798 | #endif | 1798 | #endif |
1799 | neigh_table_clear(&nd_tbl); | 1799 | neigh_table_clear(NEIGH_ND_TABLE, &nd_tbl); |
1800 | unregister_pernet_subsys(&ndisc_net_ops); | 1800 | unregister_pernet_subsys(&ndisc_net_ops); |
1801 | } | 1801 | } |