aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-17 07:53:09 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-17 18:38:18 -0500
commit8e022ee63f344e0dd12e60f5cdbacabcd312c4c7 (patch)
treec21532fc983f1dd9c5412516dc4d8e2fffa22a1f /include/net
parent7ff74a596b6aa47ccc71f6b9a26006af69d0e33f (diff)
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/net')
-rw-r--r--include/net/ndisc.h4
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, _
148 (p32[3] * hash_rnd[3])); 148 (p32[3] * hash_rnd[3]));
149} 149}
150 150
151static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, const void *pkey) 151static inline struct neighbour *__ipv6_neigh_lookup(struct net_device *dev, const void *pkey)
152{ 152{
153 struct neigh_hash_table *nht; 153 struct neigh_hash_table *nht;
154 const u32 *p32 = pkey; 154 const u32 *p32 = pkey;
@@ -156,7 +156,7 @@ static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, str
156 u32 hash_val; 156 u32 hash_val;
157 157
158 rcu_read_lock_bh(); 158 rcu_read_lock_bh();
159 nht = rcu_dereference_bh(tbl->nht); 159 nht = rcu_dereference_bh(nd_tbl.nht);
160 hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift); 160 hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
161 for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]); 161 for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
162 n != NULL; 162 n != NULL;