Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

neigh: fix setting of default gc_* values

Browse Source 
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>
This commit is contained in:
Jiri Pirko 2014-02-21 14:52:57 +01:00 committed by David S. Miller
parent f5ddcbbb40
commit b194c1f1db
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/neighbour.c
View File

@ -3046,7 +3046,7 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,
if (!t) if (!t)
goto err; 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].data += (long) p;
t->neigh_vars[i].extra1 = dev; t->neigh_vars[i].extra1 = dev;
t->neigh_vars[i].extra2 = p; t->neigh_vars[i].extra2 = p;