diff options
| author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-17 13:53:09 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-18 00:38:18 +0100 |
| commit | 8e022ee63f344e0dd12e60f5cdbacabcd312c4c7 (patch) | |
| tree | c21532fc983f1dd9c5412516dc4d8e2fffa22a1f /include | |
| parent | ndisc: Update neigh->updated with write lock. (diff) | |
| download | linux-8e022ee63f344e0dd12e60f5cdbacabcd312c4c7.tar.xz linux-8e022ee63f344e0dd12e60f5cdbacabcd312c4c7.zip | |
ndisc: Remove tbl argument for __ipv6_neigh_lookup().
We can refer to nd_tbl directly.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/ndisc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 23b3a7c58783..bbc938edf41b 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -148,7 +148,7 @@ static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, _ (p32[3] * hash_rnd[3])); } -static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, const void *pkey) +static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey) { struct neigh_hash_table *nht; const u32 *p32 = pkey; @@ -156,7 +156,7 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, str u32 hash_val; rcu_read_lock_bh(); - nht = rcu_dereference_bh(tbl->nht); + nht = rcu_dereference_bh(nd_tbl.nht); hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift); for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]); n != NULL; |