diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/core/neighbour.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 4062b88bfc1b..2328acbd16cd 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -358,11 +358,12 @@ struct neighbour *neigh_lookup(struct neigh_table *tbl, const void *pkey, | |||
358 | { | 358 | { |
359 | struct neighbour *n; | 359 | struct neighbour *n; |
360 | int key_len = tbl->key_len; | 360 | int key_len = tbl->key_len; |
361 | u32 hash_val = tbl->hash(pkey, dev); | 361 | u32 hash_val; |
362 | 362 | ||
363 | NEIGH_CACHE_STAT_INC(tbl, lookups); | 363 | NEIGH_CACHE_STAT_INC(tbl, lookups); |
364 | 364 | ||
365 | read_lock_bh(&tbl->lock); | 365 | read_lock_bh(&tbl->lock); |
366 | hash_val = tbl->hash(pkey, dev); | ||
366 | for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) { | 367 | for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) { |
367 | if (dev == n->dev && !memcmp(n->primary_key, pkey, key_len)) { | 368 | if (dev == n->dev && !memcmp(n->primary_key, pkey, key_len)) { |
368 | neigh_hold(n); | 369 | neigh_hold(n); |
@@ -379,11 +380,12 @@ struct neighbour *neigh_lookup_nodev(struct neigh_table *tbl, struct net *net, | |||
379 | { | 380 | { |
380 | struct neighbour *n; | 381 | struct neighbour *n; |
381 | int key_len = tbl->key_len; | 382 | int key_len = tbl->key_len; |
382 | u32 hash_val = tbl->hash(pkey, NULL); | 383 | u32 hash_val; |
383 | 384 | ||
384 | NEIGH_CACHE_STAT_INC(tbl, lookups); | 385 | NEIGH_CACHE_STAT_INC(tbl, lookups); |
385 | 386 | ||
386 | read_lock_bh(&tbl->lock); | 387 | read_lock_bh(&tbl->lock); |
388 | hash_val = tbl->hash(pkey, NULL); | ||
387 | for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) { | 389 | for (n = tbl->hash_buckets[hash_val & tbl->hash_mask]; n; n = n->next) { |
388 | if (!memcmp(n->primary_key, pkey, key_len) && | 390 | if (!memcmp(n->primary_key, pkey, key_len) && |
389 | (net == n->dev->nd_net)) { | 391 | (net == n->dev->nd_net)) { |