From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86BEAC4CEC9 for ; Wed, 18 Sep 2019 06:30:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52EEC218AF for ; Wed, 18 Sep 2019 06:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568788231; bh=gPJSnSiN05V66XzxYMfnHfGwJf/nfZJAB7FFcpfenfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UhbX0PbyvLYeRPsEe9hTxTt27VMTMaB1CGlOKeNHiXwcFImTMVSGMENMRipd3Ylc/ MxeUuxjEOKKJWIdkv4u1k3Th2h2Nmg3PM0468RmkoYmIHaWLPKyYnmIaDdoL/A1kzi GkYFOzi9pt7VPHgMmv1PhRiQ2HmXG1dbmOmyW2FA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728030AbfIRGYd (ORCPT ); Wed, 18 Sep 2019 02:24:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:44956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728814AbfIRGY1 (ORCPT ); Wed, 18 Sep 2019 02:24:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1DBCD21924; Wed, 18 Sep 2019 06:24:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568787866; bh=gPJSnSiN05V66XzxYMfnHfGwJf/nfZJAB7FFcpfenfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TM0nFrDWJnjkvy8bkemxPQq83dVT5GAgxrPdS7yjJusYn4nhL1PpsvCdtjXL38fZm YL8p2zwMdoCI4RbTamksJz9t2//T7EUjaOz4nMOj4tJTsSqWT2O2anrmGJ38FTBI4d wdD4iQikktfTtvyMK96YeXZNpWF9Y8NPpxYsyn64= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xin Long , Marcelo Ricardo Leitner , Neil Horman , "David S. Miller" Subject: [PATCH 5.2 13/85] sctp: use transport pf_retrans in sctp_do_8_2_transport_strike Date: Wed, 18 Sep 2019 08:18:31 +0200 Message-Id: <20190918061234.563597038@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061234.107708857@linuxfoundation.org> References: <20190918061234.107708857@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Long [ Upstream commit 10eb56c582c557c629271f1ee31e15e7a9b2558b ] Transport should use its own pf_retrans to do the error_count check, instead of asoc's. Otherwise, it's meaningless to make pf_retrans per transport. Fixes: 5aa93bcf66f4 ("sctp: Implement quick failover draft from tsvwg") Signed-off-by: Xin Long Acked-by: Marcelo Ricardo Leitner Acked-by: Neil Horman Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/sctp/sm_sideeffect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/sctp/sm_sideeffect.c +++ b/net/sctp/sm_sideeffect.c @@ -547,7 +547,7 @@ static void sctp_do_8_2_transport_strike if (net->sctp.pf_enable && (transport->state == SCTP_ACTIVE) && (transport->error_count < transport->pathmaxrxt) && - (transport->error_count > asoc->pf_retrans)) { + (transport->error_count > transport->pf_retrans)) { sctp_assoc_control_transport(asoc, transport, SCTP_TRANSPORT_PF,