summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWei Wang <weiwan@google.com>2017-01-23 10:59:21 -0800
committerDavid S. Miller <davem@davemloft.net>2017-01-25 14:04:38 -0500
commit25776aa943401662617437841b3d3ea4693ee98a (patch)
treea84a7f46ab21c65a7491b719dfaa7bc926270d1e /net
parent065263f40f0972d5f1cd294bb0242bd5aa5f06b2 (diff)
downloadlinux-stable-25776aa943401662617437841b3d3ea4693ee98a.tar.gz
linux-stable-25776aa943401662617437841b3d3ea4693ee98a.tar.bz2
linux-stable-25776aa943401662617437841b3d3ea4693ee98a.zip
net: Remove __sk_dst_reset() in tcp_v6_connect()
Remove __sk_dst_reset() in the failure handling because __sk_dst_reset() will eventually get called when sk is released. No need to handle it in the protocol specific connect call. This is also to make the code path consistent with ipv4. Signed-off-by: Wei Wang <weiwan@google.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/tcp_ipv6.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index f72100eedd5d..0b7cd3d009b6 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -295,7 +295,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
late_failure:
tcp_set_state(sk, TCP_CLOSE);
- __sk_dst_reset(sk);
failure:
inet->inet_dport = 0;
sk->sk_route_caps = 0;