From 1805dc21e646c8849e93fd76ad609a6df4247034 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Mon, 31 Jan 2011 20:54:17 -0800
Subject: [PATCH] --- yaml --- r: 232855 b: refs/heads/master c:
 bf36076a67db6d7423d09d861a072337866f0dd9 h: refs/heads/master i:   232853:
 e8c411328708749871606b28aae96086fc3737de   232851:
 ca1b61a91794ae95e0e32d1e7b50b02ebe7189b7   232847:
 29b29a34c71aa5bb1b475e9330f4c764fc9bd68c v: v3

---
 [refs]                           | 2 +-
 trunk/net/ipv6/sysctl_net_ipv6.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3bee85e00abb..4f2c8fae8016 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 785e8cc39baf31d5c18a2d198ded03a003c9c190
+refs/heads/master: bf36076a67db6d7423d09d861a072337866f0dd9
diff --git a/trunk/net/ipv6/sysctl_net_ipv6.c b/trunk/net/ipv6/sysctl_net_ipv6.c
index fa1d8f4e0051..7cb65ef79f9c 100644
--- a/trunk/net/ipv6/sysctl_net_ipv6.c
+++ b/trunk/net/ipv6/sysctl_net_ipv6.c
@@ -15,6 +15,8 @@
 #include <net/addrconf.h>
 #include <net/inet_frag.h>
 
+static struct ctl_table empty[1];
+
 static ctl_table ipv6_table_template[] = {
 	{
 		.procname	= "route",
@@ -35,6 +37,12 @@ static ctl_table ipv6_table_template[] = {
 		.mode		= 0644,
 		.proc_handler	= proc_dointvec
 	},
+	{
+		.procname	= "neigh",
+		.maxlen		= 0,
+		.mode		= 0555,
+		.child		= empty,
+	},
 	{ }
 };
 
@@ -152,7 +160,6 @@ static struct ctl_table_header *ip6_base;
 
 int ipv6_static_sysctl_register(void)
 {
-	static struct ctl_table empty[1];
 	ip6_base = register_sysctl_paths(net_ipv6_ctl_path, empty);
 	if (ip6_base == NULL)
 		return -ENOMEM;