diff --git a/[refs] b/[refs] index 9cc5f9f039f1..07b31c82b2ac 100644 --- 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 index e287346e0934..2a83914b0277 100644 --- 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