diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 09:41:28 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-03-12 09:41:28 -0600 |
| commit | e2aa4177264c1a459779d6e35fae22adf17a9232 (patch) | |
| tree | beba4b40aa90f6f033eb261cf5a5453c5957c87c /net/core/neighbour.c | |
| parent | 25db711df3258d125dc1209800317e5c0ef3c870 (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | lwn-e2aa4177264c1a459779d6e35fae22adf17a9232.tar.gz lwn-e2aa4177264c1a459779d6e35fae22adf17a9232.zip | |
Merge tag 'v3.3-rc7' into gpio/next
Linux 3.3-rc7. Merged into the gpio branch to pick up gpio bugfixes already
in mainline before queueing up move v3.4 patches
Diffstat (limited to 'net/core/neighbour.c')
| -rw-r--r-- | net/core/neighbour.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index e287346e0934..2a83914b0277 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -826,6 +826,8 @@ next_elt: 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 |