From patchwork Mon Jan 23 18:59:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 718729 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3v6gcb45bLz9t0Z for ; Tue, 24 Jan 2017 06:00:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M2uryptp"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751493AbdAWTA2 (ORCPT ); Mon, 23 Jan 2017 14:00:28 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33333 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474AbdAWTA0 (ORCPT ); Mon, 23 Jan 2017 14:00:26 -0500 Received: by mail-pf0-f196.google.com with SMTP id e4so10494474pfg.0 for ; Mon, 23 Jan 2017 11:00:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WrTS5MVGhzfXIDkLccZ2o+BjmZ1D+QNalOq5KtsPSXY=; b=M2uryptpVJKA5QVra2M21XNyAJhhl8dZREvLLSwwTV2Zw9mICUxIr/P5UX2UMpwk9I 2e4IGr3UFxxEmRObsuFF0nbgxZ1w+YI1xtwsfU0sPUfI/RT8uqumx+t8WSX4FXRpL2H3 0WTIjbHfoVYVOMR3F0WgUo43k1VnDZOJN9lsDkVthpbyLSNcVyBiwDrXO2XMoi2o6b4d 93U+2GCoM+KurMJCYuOkOOlGaoVX63dGocDplavYh4PnUcCIX8JBH1vMwWQoUea+RTmy QyNqcUemGeMfaMKJkVUY3WODZ6zlZXXwWOQcG0mwjlGzubUqATOin8jPU0qY/wbIfjz4 LMRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WrTS5MVGhzfXIDkLccZ2o+BjmZ1D+QNalOq5KtsPSXY=; b=F4kz+m3D4kicyU3CmKaJNeX9nvmf8OoRODxbpEkj2gRNlnFBT0uHze2OIEqx+QtPZ3 1UgV7dwN5Nasv6DWsF5Plb052dX7/hMl5CU+9tXoWsdg7ssRG96lnSWHdR07Vd6U4MML TdKxrKjYMYTdn4K9LPK1R/aJhLXFj31uFKms5omYj6Qyvc79irHItnEkZls9WZUvqlMk 710lv6NH1A7ejDAvHQD4s/Mfcq7eOIEXrSNtXOt/flG6wtYdkiy7UUIeWSl7gsNY83Mj PNbxLMD3k9PwPqso8L5Al8TdZTPb5TN6BAx+L8z8WlSEs9hbzFeEAHNwiirsN3jdS4n1 F8/w== X-Gm-Message-State: AIkVDXIrIJlZDFj+/+ukv+VPxMHW7ojNRg2Fu4k7VizsIBCG8pdI4xs4Tcn4d94PDAhQxw== X-Received: by 10.98.35.25 with SMTP id j25mr33481223pfj.35.1485198025966; Mon, 23 Jan 2017 11:00:25 -0800 (PST) Received: from weiwan0.mtv.corp.google.com ([100.99.140.129]) by smtp.gmail.com with ESMTPSA id 66sm38732919pfx.29.2017.01.23.11.00.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 11:00:25 -0800 (PST) From: Wei Wang To: netdev@vger.kernel.org, David Miller Cc: Eric Dumazet , Yuchung Cheng , Wei Wang Subject: [PATCH net-next 2/3] net: Remove __sk_dst_reset() in tcp_v6_connect() Date: Mon, 23 Jan 2017 10:59:21 -0800 Message-Id: <20170123185922.48046-3-tracywwnj@gmail.com> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170123185922.48046-1-tracywwnj@gmail.com> References: <20170123185922.48046-1-tracywwnj@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang 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 Acked-by: Eric Dumazet --- net/ipv6/tcp_ipv6.c | 1 - 1 file changed, 1 deletion(-) 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;