Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2014-04-07 13:35:32 +0200
committerJiri Kosina <jkosina@suse.cz>2014-04-07 14:32:42 +0200
commitb6d3f1ae61584d034de13b58b19a0efbf0693fec (patch)
treeec846484f076093184f735012ab673b13b8046fa
parentcfd8022316f977ae696e7e7bd67076b13b1977ed (diff)
patches.fixes/inet-Pass-inetpeer-root-into-inet_getpeer-interfaces.patch (bnc#864833 bnc#870801). - Refresh patches.fixes/inet-Hide-route-peer-accesses-behind-helpers.patch. suse-commit: 172cdff8d6a4f5d488dc82dff867e68ef50201cc
-rw-r--r--net/ipv4/tcp_ipv4.c4
-rw-r--r--net/ipv6/tcp_ipv6.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a9227fc9b2f8..3f0b72a6384a 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1793,7 +1793,7 @@ struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it)
if (!rt ||
inet->cork.fl.u.ip4.daddr != inet->inet_daddr) {
- peer = inet_getpeer_v4(net, inet->inet_daddr, 1);
+ peer = inet_getpeer_v4(net->ipv4.peers, inet->inet_daddr, 1);
*release_it = true;
} else {
if (!rt_has_peer(rt))
@@ -1811,7 +1811,7 @@ void *tcp_v4_tw_get_peer(struct sock *sk)
struct inet_timewait_sock *tw = inet_twsk(sk);
struct net *net = sock_net(sk);
- return inet_getpeer_v4(net, tw->tw_daddr, 1);
+ return inet_getpeer_v4(net->ipv4.peers, tw->tw_daddr, 1);
}
EXPORT_SYMBOL(tcp_v4_tw_get_peer);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 6ac9fb54fb0f..1a2be8bcf752 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1871,7 +1871,7 @@ static struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it)
if (!rt ||
!ipv6_addr_equal(&np->daddr, &rt->rt6i_dst.addr)) {
- peer = inet_getpeer_v6(net, &np->daddr, 1);
+ peer = inet_getpeer_v6(net->ipv6.peers, &np->daddr, 1);
*release_it = true;
} else {
if (!rt6_has_peer(rt))
@@ -1892,7 +1892,7 @@ static void *tcp_v6_tw_get_peer(struct sock *sk)
if (tw->tw_family == AF_INET)
return tcp_v4_tw_get_peer(sk);
- return inet_getpeer_v6(net, &tw6->tw_v6_daddr, 1);
+ return inet_getpeer_v6(net->ipv6.peers, &tw6->tw_v6_daddr, 1);
}
static struct timewait_sock_ops tcp6_timewait_sock_ops = {