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 A08BDC43381 for ; Mon, 18 Mar 2019 12:07:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6CA1220857 for ; Mon, 18 Mar 2019 12:07:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="m2ksz+1V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727500AbfCRMHE (ORCPT ); Mon, 18 Mar 2019 08:07:04 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35363 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726504AbfCRMHE (ORCPT ); Mon, 18 Mar 2019 08:07:04 -0400 Received: by mail-pg1-f196.google.com with SMTP id g8so571533pgf.2; Mon, 18 Mar 2019 05:07:03 -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=+c9dV/YB/vg8fI6iC674p+a5IqvFJcSHXHSBwYAFGOA=; b=m2ksz+1Vn/7EbG6CgIW7l9IFI6iAZ0OEJLz60mVmpxFETrR6FgLWuGkhhctIDXLvQp evLUGjjY8/mRUCuRVG5FyTKfDSqqhHAxntQ+DtFYp5nPGJ57M9yBI872ikFhrKVi4u8x FCNMVlL8bVOiEXFRhfnR66StKUsyfEUqxa8UeIE406M0Nyrh85wzQSz6edvd2uzrEcst eMKmMnukdUN5+l+l5ZfxeI/jnzdUwQJ0yVyfB7uDXQB/kXQsF6oX0B6DnDLazCyq4/Fr F1K3u0Wu4zSwN04QdC3pcmJIY5qUn0LB3Eb8ostKc+k89LoXLHz3pRAS+QKPv/wXR7E8 ugTQ== 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=+c9dV/YB/vg8fI6iC674p+a5IqvFJcSHXHSBwYAFGOA=; b=bHwvhtPPJjr/qCS4Wz2KUtHAK4hZR8KAS1reQA46MIVfcJEbLRL32sKT6o6appBwXx QM1YW6bzc1WYgWqYxqybUutrkZmR+LxkojegLJgcg3ggl9eMUcy1yxj0Gc1Oy3hRpdD3 azePZ1LWR1Oxrh3fnVGctffFOI7NsioLEDwgIC01qOyz55SEZ3SF5nHrzrvkFkFjZOCm uwpGQPXRfmojH/W/FaUQXphyXVzpwE0qY8CHtOKSRBMNyow/VwrsdJqQyiP8mJwiUIEE eptSCUF0uzC2R9kjGrKjlbDK8w8rWoKaxsCQlaMog0TsKZiNQVND8L0uMEAtVkRJb4AY ZAFg== X-Gm-Message-State: APjAAAVLvxmxOYyAARz8qw/XFPh/v1C+joaxUpjF0tBix5jj0VdqfWe0 wrRJbA5dja0bE/zndBKG+y0JD5Zpylo= X-Google-Smtp-Source: APXvYqx/PCmeuGlRMJaVV2e6EJ2jdXZlW1vOlarILMTL5jD4WOA43ebVmhiWduP0MA/zzywAvSmvLg== X-Received: by 2002:a63:1d03:: with SMTP id d3mr17263735pgd.42.1552910823091; Mon, 18 Mar 2019 05:07:03 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id c130sm17253860pfb.145.2019.03.18.05.07.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:07:01 -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 05/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_MAX_BURST sockopt Date: Mon, 18 Mar 2019 20:06:03 +0800 Message-Id: <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> 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_MAX_BURST sockopt. Fixes: e0651a0dc877 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_MAX_BURST 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 b024a62..df879b1 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3682,6 +3682,9 @@ static int sctp_setsockopt_maxburst(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id == SCTP_FUTURE_ASSOC || params.assoc_id == SCTP_ALL_ASSOC) sp->max_burst = params.assoc_value; -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xin Long Date: Mon, 18 Mar 2019 12:06:03 +0000 Subject: [PATCH net 05/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_MAX_BURST sockopt Message-Id: <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> List-Id: References: <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> 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_MAX_BURST sockopt. Fixes: e0651a0dc877 ("sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_MAX_BURST 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 b024a62..df879b1 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3682,6 +3682,9 @@ static int sctp_setsockopt_maxburst(struct sock *sk, return 0; } + if (sctp_style(sk, TCP)) + params.assoc_id = SCTP_FUTURE_ASSOC; + if (params.assoc_id = SCTP_FUTURE_ASSOC || params.assoc_id = SCTP_ALL_ASSOC) sp->max_burst = params.assoc_value; -- 2.1.0