Merge branch 'master' into upstream

2006-09-19 15:13:45 -04:00
parent 8624a1c937 47a5c6fa0e
commit 23b6b0e3e8
33 changed files with 372 additions and 629 deletions
--- 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;
 }