]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
net: Remove __sk_dst_reset() in tcp_v6_connect()
authorWei Wang <weiwan@google.com>
Mon, 23 Jan 2017 18:59:21 +0000 (10:59 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Jan 2017 19:04:38 +0000 (14:04 -0500)
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>
net/ipv6/tcp_ipv6.c

index f72100eedd5d76fb59950e798072d04de25d74cd..0b7cd3d009b653c5b4ee3929f48c1594f2a7764f 100644 (file)
@@ -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;