From: Jiri Pirko <jiri@resnulli.us>
Date: Fri, 21 Feb 2014 13:52:57 +0000 (+0100)
Subject: neigh: fix setting of default gc_* values
X-Git-Tag: upstream/snapshot3+hdmi~3332^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b194c1f1dbd5f2671e49e0ac801b1b78dc7de93b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

neigh: fix setting of default gc_* values

This patch fixes bug introduced by:
commit 1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca
"neigh: restore old behaviour of default parms values"

The thing is that in neigh_sysctl_register, extra1 and extra2 which were
previously set for NEIGH_VAR_GC_* are overwritten. That leads to
nonsense int limits for gc_* variables. So fix this by not touching
extra* fields for gc_* variables.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index b9e9e0d..e1aa0f3 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -3046,7 +3046,7 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
 	if (!t)
 		goto err;
 
-	for (i = 0; i < ARRAY_SIZE(t->neigh_vars); i++) {
+	for (i = 0; i < NEIGH_VAR_GC_INTERVAL; i++) {
 		t->neigh_vars[i].data += (long) p;
 		t->neigh_vars[i].extra1 = dev;
 		t->neigh_vars[i].extra2 = p;