From patchwork Tue Dec 8 09:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 553843 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 CA05F1402D8 for ; Tue, 8 Dec 2015 20:47:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756301AbbLHJrb (ORCPT ); Tue, 8 Dec 2015 04:47:31 -0500 Received: from mail.windriver.com ([147.11.1.11]:63475 "EHLO mail.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756289AbbLHJr2 (ORCPT ); Tue, 8 Dec 2015 04:47:28 -0500 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id tB89lDJS008376 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Tue, 8 Dec 2015 01:47:13 -0800 (PST) Received: from sustaining-1.corp.ad.wrs.com (128.224.163.164) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.248.2; Tue, 8 Dec 2015 01:47:12 -0800 From: To: , , , CC: , Subject: [PATCH 1/1] net:sctp: disable to inform ULP about transition from PF to active state Date: Tue, 8 Dec 2015 17:47:22 +0800 Message-ID: <1449568042-9176-1-git-send-email-zyjzyj2000@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: yzhu1 This feature is introduced in the commit 5aa93bc "sctp: Implement quick failover draft from tsvwg". This feature should be disabled if the quick failover feature is disabled. Signed-off-by: yzhu1 --- net/sctp/associola.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 559afd0..7438625 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -795,7 +795,8 @@ void sctp_assoc_control_transport(struct sctp_association *asoc, * active state and set cwnd to 1 MTU, see SCTP * Quick failover draft section 5.1, point 5 */ - if (transport->state == SCTP_PF) { + if ((asoc->pf_retrans < asoc->max_retrans) && + (transport->state == SCTP_PF)) { ulp_notify = false; transport->cwnd = asoc->pathmtu; }