---

yaml --- r: 214956 b: refs/heads/master c: 767e97e h: refs/heads/master v: v3
git-mirror · Oct 7, 2010 · 1a6ba3b · 1a6ba3b
1 parent 5a30085
commit 1a6ba3b
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 55 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 546add79468183f266c75c632c96e4b0029e0d96
+refs/heads/master: 767e97e1e0db0d0f3152cd2f3bd3403596aedbad
diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h
@@ -91,7 +91,7 @@ struct neigh_statistics {
 #define NEIGH_CACHE_STAT_INC(tbl, field) this_cpu_inc((tbl)->stats->field)
 
 struct neighbour {
-	struct neighbour	*next;
+	struct neighbour __rcu	*next;
 	struct neigh_table	*tbl;
 	struct neigh_parms	*parms;
 	struct net_device	*dev;
@@ -111,6 +111,7 @@ struct neighbour {
 	struct sk_buff_head	arp_queue;
 	struct timer_list	timer;
 	const struct neigh_ops	*ops;
+	struct rcu_head		rcu;
 	u8			primary_key[0];
 };
 
@@ -139,7 +140,7 @@ struct pneigh_entry {
  */
 
 struct neigh_hash_table {
-	struct neighbour	**hash_buckets;
+	struct neighbour __rcu	**hash_buckets;
 	unsigned int		hash_mask;
 	__u32			hash_rnd;
 	struct rcu_head		rcu;