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=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 62650C43381 for ; Mon, 18 Mar 2019 12:06:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B5FA2085A for ; Mon, 18 Mar 2019 12:06:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="B9fKuhcr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727433AbfCRMGi (ORCPT ); Mon, 18 Mar 2019 08:06:38 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37806 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMGi (ORCPT ); Mon, 18 Mar 2019 08:06:38 -0400 Received: by mail-pg1-f195.google.com with SMTP id q206so11230925pgq.4; Mon, 18 Mar 2019 05:06:37 -0700 (PDT) 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 :in-reply-to:references; bh=cwmzbNLKzNPM7p1XwHivBctO4Lj4BnF26+EZy+A4Qk4=; b=B9fKuhcrZLNhwZPyt9xE4Uf+2ZT27V1XEs3NgZ6OJci1gr/USFsHoEPJlLPdHS1tfx fNWtjxXzlXATD4Oi4j8YLUo0/5Di3Qcr26Wvanu8QbUq/Uk5YLJSDo4lnPnri7ULxDtx 4s8Dc476mk2N0JloQ+F39uhllJ2ovwQz4ixl4KEXwZiXCTs0u9yK30SF51W492x/gByO lQY6G5g7Wcng9SQ57LIoVw1aApaVyh1l45Ag67WssCaSY+S+iX3dd0U/blhEcopM1rWR WlZDzsOqW5g6yYFIqhFFT3sYyMDBeJwKh/5wx/UhWHPc2YKdbiMpSJ1kteOQ9O1WRbWg eKlg== 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:in-reply-to:references; bh=cwmzbNLKzNPM7p1XwHivBctO4Lj4BnF26+EZy+A4Qk4=; b=RBzemav70FCFcqCIgMgwRJfGk8fxqV1QDqT+Xcj1UiAiiw408iQe0OMSDX06xH4xGT lBGa2ppgkbrKHo88Qvwh/YMht8eUou8SCvFQxKbUTDuOfUr5eUeRqcmj8eKRFjpXc87i t8WMS1a9Idu1yFK/nvpQFKuS7BgD13gN2KqtWvXJ1aa8NO3ZD1azEWNR4cY3EkT9eXuV Qf8AOzG4HCIkLjGUtSOd8sxknD/YP/HtU1vzHbJtFYnE/m7uuprKJgUcPoIXJqpSNvim o5+C+iasnRxapjvfdQX8yDSmTdB778wo3qEeiW8AY6AcGctG/s9H6tHZZHDFbuEvtLiK WS2w== X-Gm-Message-State: APjAAAUANqzX59YyDTC+ILYJdziIFNw1yZX+tkGr67lJ73dYj9UqeW7B CRncV4JJXeECmoFCj3mulmDNHAQaBkU= X-Google-Smtp-Source: APXvYqzNWEhSQPWOgDkSO8OBlA+7QxC0hOvWotammDuxju+stIgXBHCaIhHFyR2nBr+Q5ib7ANhRJg== X-Received: by 2002:a63:c04a:: with SMTP id z10mr17688800pgi.115.1552910796963; Mon, 18 Mar 2019 05:06:36 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id v2sm17463497pfg.118.2019.03.18.05.06.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:06:35 -0700 (PDT) From: Xin Long To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman Subject: [PATCH net 02/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DELAYED_SACK sockopt Date: Mon, 18 Mar 2019 20:06:00 +0800 Message-Id: X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_DELAYED_SACK sockopt. Fixes: 9c5829e1c49e ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DELAYED_SACK sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d0e5c62..4c5821b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -2920,6 +2920,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + params.sack_assoc_id = SCTP_FUTURE_ASSOC; + if (params.sack_assoc_id == SCTP_FUTURE_ASSOC || params.sack_assoc_id == SCTP_ALL_ASSOC) { if (params.sack_delay) { -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xin Long Date: Mon, 18 Mar 2019 12:06:00 +0000 Subject: [PATCH net 02/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DELAYED_SACK sockopt Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: network dev , linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner , Neil Horman A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_DELAYED_SACK sockopt. Fixes: 9c5829e1c49e ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DELAYED_SACK sockopt") Signed-off-by: Xin Long --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d0e5c62..4c5821b 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -2920,6 +2920,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + params.sack_assoc_id = SCTP_FUTURE_ASSOC; + if (params.sack_assoc_id = SCTP_FUTURE_ASSOC || params.sack_assoc_id = SCTP_ALL_ASSOC) { if (params.sack_delay) { -- 2.1.0