aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/tcp_ipv6.c
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2012-06-07 21:21:40 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-08 17:27:23 -0400
commit54db0cc2ba0d38166acc2d6bae21721405305537 (patch)
tree9c067a1e7be7e3f2c862b3d64568ba330a0e0b2c /net/ipv6/tcp_ipv6.c
parentc8a627ed06d6d49bf65015a2185c519335c4c83f (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/tcp_ipv6.c')
-rw-r--r--net/ipv6/tcp_ipv6.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 80758255556..1a9cdd09f11 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1736,11 +1736,12 @@ static struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it)
1736{ 1736{
1737 struct rt6_info *rt = (struct rt6_info *) __sk_dst_get(sk); 1737 struct rt6_info *rt = (struct rt6_info *) __sk_dst_get(sk);
1738 struct ipv6_pinfo *np = inet6_sk(sk); 1738 struct ipv6_pinfo *np = inet6_sk(sk);
1739 struct net *net = sock_net(sk);
1739 struct inet_peer *peer; 1740 struct inet_peer *peer;
1740 1741
1741 if (!rt || 1742 if (!rt ||
1742 !ipv6_addr_equal(&np->daddr, &rt->rt6i_dst.addr)) { 1743 !ipv6_addr_equal(&np->daddr, &rt->rt6i_dst.addr)) {
1743 peer = inet_getpeer_v6(&np->daddr, 1); 1744 peer = inet_getpeer_v6(net, &np->daddr, 1);
1744 *release_it = true; 1745 *release_it = true;
1745 } else { 1746 } else {
1746 if (!rt->rt6i_peer) 1747 if (!rt->rt6i_peer)
@@ -1756,11 +1757,12 @@ static void *tcp_v6_tw_get_peer(struct sock *sk)
1756{ 1757{
1757 const struct inet6_timewait_sock *tw6 = inet6_twsk(sk); 1758 const struct inet6_timewait_sock *tw6 = inet6_twsk(sk);
1758 const struct inet_timewait_sock *tw = inet_twsk(sk); 1759 const struct inet_timewait_sock *tw = inet_twsk(sk);
1760 struct net *net = sock_net(sk);
1759 1761
1760 if (tw->tw_family == AF_INET) 1762 if (tw->tw_family == AF_INET)
1761 return tcp_v4_tw_get_peer(sk); 1763 return tcp_v4_tw_get_peer(sk);
1762 1764
1763 return inet_getpeer_v6(&tw6->tw_v6_daddr, 1); 1765 return inet_getpeer_v6(net, &tw6->tw_v6_daddr, 1);
1764} 1766}
1765 1767
1766static struct timewait_sock_ops tcp6_timewait_sock_ops = { 1768static struct timewait_sock_ops tcp6_timewait_sock_ops = {