---

yaml --- r: 287977 b: refs/heads/master c: 84338a6 h: refs/heads/master i: 287975: 5b1d055 v: v3
git-mirror · Feb 21, 2012 · 81161af · 81161af
1 parent 856de39
commit 81161af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8f93083be54696d3b7f8e8c6c70d411d01f9e8
+refs/heads/master: 84338a6c9dbb6ff3de4749864020f8f25d86fc81
diff --git a/trunk/net/core/neighbour.c b/trunk/net/core/neighbour.c
@@ -826,6 +826,8 @@ static void neigh_periodic_work(struct work_struct *work)
 		write_unlock_bh(&tbl->lock);
 		cond_resched();
 		write_lock_bh(&tbl->lock);
+		nht = rcu_dereference_protected(tbl->nht,
+						lockdep_is_held(&tbl->lock));
 	}
 	/* Cycle through all hash buckets every base_reachable_time/2 ticks.
 	 * ARP entry timeouts range from 1/2 base_reachable_time to 3/2