diff options
author | Gao feng <gaofeng@cn.fujitsu.com> | 2012-06-07 21:21:40 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-08 17:27:23 -0400 |
commit | 54db0cc2ba0d38166acc2d6bae21721405305537 (patch) | |
tree | 9c067a1e7be7e3f2c862b3d64568ba330a0e0b2c /net/ipv6/route.c | |
parent | c8a627ed06d6d49bf65015a2185c519335c4c83f (diff) |
inetpeer: add parameter net for inet_getpeer_v4,v6
add struct net as a parameter of inet_getpeer_v[4,6],
use net to replace &init_net.
and modify some places to provide net for inet_getpeer_v[4,6]
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 999a982ad3fd..4eca0130cce7 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -306,9 +306,10 @@ static u32 rt6_peer_genid(void) | |||
306 | 306 | ||
307 | void rt6_bind_peer(struct rt6_info *rt, int create) | 307 | void rt6_bind_peer(struct rt6_info *rt, int create) |
308 | { | 308 | { |
309 | struct net *net = dev_net(rt->dst.dev); | ||
309 | struct inet_peer *peer; | 310 | struct inet_peer *peer; |
310 | 311 | ||
311 | peer = inet_getpeer_v6(&rt->rt6i_dst.addr, create); | 312 | peer = inet_getpeer_v6(net, &rt->rt6i_dst.addr, create); |
312 | if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL) | 313 | if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL) |
313 | inet_putpeer(peer); | 314 | inet_putpeer(peer); |
314 | else | 315 | else |