diff options
| author | Jeff Garzik | 2006-09-19 21:13:45 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-09-19 21:13:45 +0200 |
| commit | 23b6b0e3e8306ce3d00e0c87196bfaad335b9096 (patch) | |
| tree | 3e690e564ac42444937b0d66b624c0e292d4a88a /net/core | |
| parent | [PATCH] Remove powerpc specific parts of 3c509 driver (diff) | |
| parent | x86: save/restore eflags in context switch (diff) | |
| download | kernel-qcow2-linux-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.tar.gz kernel-qcow2-linux-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.tar.xz kernel-qcow2-linux-23b6b0e3e8306ce3d00e0c87196bfaad335b9096.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/neighbour.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 5130d2efdbbe..fe2113f54e2b 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1432,6 +1432,9 @@ int neigh_table_clear(struct neigh_table *tbl) kfree(tbl->phash_buckets); tbl->phash_buckets = NULL; + free_percpu(tbl->stats); + tbl->stats = NULL; + return 0; } |