diff options
author | YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org> | 2013-01-17 07:53:09 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-17 18:38:18 -0500 |
commit | 8e022ee63f344e0dd12e60f5cdbacabcd312c4c7 (patch) | |
tree | c21532fc983f1dd9c5412516dc4d8e2fffa22a1f /net | |
parent | 7ff74a596b6aa47ccc71f6b9a26006af69d0e33f (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 'net')
-rw-r--r-- | net/ipv6/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 1341f68e8009..5d9ca274d149 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -145,7 +145,7 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst, | |||
145 | struct neighbour *n; | 145 | struct neighbour *n; |
146 | 146 | ||
147 | daddr = choose_neigh_daddr(rt, skb, daddr); | 147 | daddr = choose_neigh_daddr(rt, skb, daddr); |
148 | n = __ipv6_neigh_lookup(&nd_tbl, dst->dev, daddr); | 148 | n = __ipv6_neigh_lookup(dst->dev, daddr); |
149 | if (n) | 149 | if (n) |
150 | return n; | 150 | return n; |
151 | return neigh_create(&nd_tbl, daddr, dst->dev); | 151 | return neigh_create(&nd_tbl, daddr, dst->dev); |
@@ -153,7 +153,7 @@ static struct neighbour *ip6_neigh_lookup(const struct dst_entry *dst, | |||
153 | 153 | ||
154 | static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev) | 154 | static int rt6_bind_neighbour(struct rt6_info *rt, struct net_device *dev) |
155 | { | 155 | { |
156 | struct neighbour *n = __ipv6_neigh_lookup(&nd_tbl, dev, &rt->rt6i_gateway); | 156 | struct neighbour *n = __ipv6_neigh_lookup(dev, &rt->rt6i_gateway); |
157 | if (!n) { | 157 | if (!n) { |
158 | n = neigh_create(&nd_tbl, &rt->rt6i_gateway, dev); | 158 | n = neigh_create(&nd_tbl, &rt->rt6i_gateway, dev); |
159 | if (IS_ERR(n)) | 159 | if (IS_ERR(n)) |