From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Mon, 24 Mar 2008 15:25:11 +0000 (+0900)
Subject: [IPV6] ADDRCONF: Fix array size for sysctls.
X-Git-Tag: v2.6.26-rc1~1138^2~212
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=f6a07b293f11d97bfbcd9b6a3ab4ad9c418a36ff

[IPV6] ADDRCONF: Fix array size for sysctls.

We have been using __NET_IPV6_MAX for adjusting the size of array
for sysctl table, but it does not work any longer because of the
deprecation of NET_IPV6_xxx constants.  Let's use DEVCONF_MAX
instead.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
---

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 87f6888..1103761 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -3877,7 +3877,7 @@ static int addrconf_sysctl_forward_strategy(ctl_table *table,
 static struct addrconf_sysctl_table
 {
 	struct ctl_table_header *sysctl_header;
-	ctl_table addrconf_vars[__NET_IPV6_MAX];
+	ctl_table addrconf_vars[DEVCONF_MAX+1];
 	char *dev_name;
 } addrconf_sysctl __read_mostly = {
 	.sysctl_header = NULL,