diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-15 17:48:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-15 17:48:35 -0500 |
| commit | 80703d265b7e8a801560d907b1bfe340e574dbca (patch) | |
| tree | 4259c2f99614735f5048ebc1f339a0ba20735d6d | |
| parent | 4c5e40366a8879a3fda6a22a4b65c02ef20a08c4 (diff) | |
| download | linux-stable-80703d265b7e8a801560d907b1bfe340e574dbca.tar.gz linux-stable-80703d265b7e8a801560d907b1bfe340e574dbca.tar.bz2 linux-stable-80703d265b7e8a801560d907b1bfe340e574dbca.zip | |
ipv4: Eliminate spurious argument to __ipv4_neigh_lookup
'tbl' is always arp_tbl, so specifying it is pointless.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/arp.h | 4 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/arp.h b/include/net/arp.h index 0013dc87940b..4a1f3fb562eb 100644 --- a/include/net/arp.h +++ b/include/net/arp.h @@ -15,14 +15,14 @@ static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd return val * hash_rnd; } -static inline struct neighbour *__ipv4_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, u32 key) +static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key) { struct neigh_hash_table *nht; struct neighbour *n; u32 hash_val; rcu_read_lock_bh(); - nht = rcu_dereference_bh(tbl->nht); + nht = rcu_dereference_bh(arp_tbl.nht); hash_val = arp_hashfn(key, dev, nht->hash_rnd[0]) >> (32 - nht->hash_shift); for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]); n != NULL; diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 4eeb8ce856e2..0489cedc1671 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1127,7 +1127,7 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst, const vo else if (rt->rt_gateway) pkey = (const __be32 *) &rt->rt_gateway; - n = __ipv4_neigh_lookup(&arp_tbl, dev, *(__force u32 *)pkey); + n = __ipv4_neigh_lookup(dev, *(__force u32 *)pkey); if (n) return n; return neigh_create(&arp_tbl, pkey, dev); |