| Message ID | ef7f0f9849c2b4de4e6c16124192c423505664ea.1552910681.git.lucien.xin@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ApdORMrd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44NFM04jMfz9sBF for <patchwork-incoming-netdev@ozlabs.org>; Mon, 18 Mar 2019 23:08:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727676AbfCRMIM (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Mon, 18 Mar 2019 08:08:12 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33182 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726812AbfCRMIL (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 18 Mar 2019 08:08:11 -0400 Received: by mail-pg1-f194.google.com with SMTP id i7so8018424pgq.0; Mon, 18 Mar 2019 05:08:11 -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=2LNkXg7HDRpFQWkgFO/L+GMKbEk62ZAMvdF+n3xk7yM=; b=ApdORMrdvuJcOCKz3xTYcRkfw/Q0Ts1WOFx79tCKgE+GpVNdRicbhgPODwv900cCHn niRetBxraLjiwTzS1XKtxQ1gFPjICI573LOyYIY+sEQFo64yRAQ4RrS6RAJoog7Vus2B +BzjTLTcoIpQMiVCUs5RNvcAL4iZlwLjQjMObU1kbKIULELe1UuQ5OD9kmJ4t/DeJfVb QAWejYoFccEw1rTwjoWutJ4LkCa4cRcDq6OGvB46BXgTAArU0YYQ+SkvM5TWYX7Lr6Uu VgLmcltBgJL4niEPCO/wxQLCF9K1fA5n1pQTFukWzwjqEdk4xmgfcv3zj0jHRwd6CeM4 MetQ== 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=2LNkXg7HDRpFQWkgFO/L+GMKbEk62ZAMvdF+n3xk7yM=; b=qgK4Z5Uq6QgTiSanRqWa73HFzvEVO67Ur+X8BKVpyQxOeQinfHIqB1iC+GzwS/8bDc bL6eDz+nctMJYEF50Cl13p2+Ukz3l2w/9Fy8cgI3hTUnVmvoZnSn0Jqbt3HGkK3n1R3H AWOdFhbaNsJ1XaNMZALyp7cS7H4ttEdWsivej3nB1ZLiK/SFyKRBXcSCiCEbtnwTU1L8 /5mg+9bfOmyVpGLXBaa7rejHtX2SO7Z5go2kQuMFxVJ7Z+sfHxgp3bdBxnW21BQiGWWT vb+/lEFFJ9aZwFfde/hMPIRjUCWFZXEjx+PzGKfQriLbyvUl7foiZK90/rXiI8VTYYSi ehnA== X-Gm-Message-State: APjAAAXrBbWxzOtZ9+LO9OjZAWimdXLUkCcxZJJFve8OHAkD7UwgvsHP kg9K1aHsBt2LmrsJ6FC4vS8qQUUObRQ= X-Google-Smtp-Source: APXvYqwUSEv9bqZiWYgKIqNZFu1DKPwUIzsQd9pygowwROzpcnkHdMlATqepcwX1IFl2REzRNSZ5HQ== X-Received: by 2002:a63:7843:: with SMTP id t64mr17441876pgc.178.1552910890936; Mon, 18 Mar 2019 05:08:10 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id m23sm9043726pfa.148.2019.03.18.05.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 05:08:10 -0700 (PDT) From: Xin Long <lucien.xin@gmail.com> To: network dev <netdev@vger.kernel.org>, linux-sctp@vger.kernel.org Cc: davem@davemloft.net, Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Neil Horman <nhorman@tuxdriver.com> Subject: [PATCH net 13/13] sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_STREAM_SCHEDULER sockopt Date: Mon, 18 Mar 2019 20:06:11 +0800 Message-Id: <ef7f0f9849c2b4de4e6c16124192c423505664ea.1552910681.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <a1956b59384a88fe50dac1852b4666793ba8c663.1552910681.git.lucien.xin@gmail.com> References: <cover.1552910681.git.lucien.xin@gmail.com> <a866141aba7511710929fffd71b0b911ddda28f4.1552910681.git.lucien.xin@gmail.com> <b7541db7198a1df5d75100bd9cb19678613c0a10.1552910681.git.lucien.xin@gmail.com> <47d570738f0cc850e9183731e47d15a7647764a0.1552910681.git.lucien.xin@gmail.com> <3d889968ad901918974cc09c78064bd4a5a24ff7.1552910681.git.lucien.xin@gmail.com> <446bf443557ec1433a5f85c9a1e15987df20a8df.1552910681.git.lucien.xin@gmail.com> <9028a9b0f9968d629614a36cbbf79fef34935717.1552910681.git.lucien.xin@gmail.com> <ead4f7e6f620d64b9616b8e394e559c55427229e.1552910681.git.lucien.xin@gmail.com> <0c9808b498eb088a9146a09c79d795e30e3c79c5.1552910681.git.lucien.xin@gmail.com> <fa16260b4714687bba2cfbf2703347c9d0d9f6c2.1552910681.git.lucien.xin@gmail.com> <35a7b393cc72087426f3c7bbd47c6fa7cbc838ae.1552910681.git.lucien.xin@gmail.com> <1b33cb70222974d65a7194a506c9e99d474732c2.1552910681.git.lucien.xin@gmail.com> <a1956b59384a88fe50dac1852b4666793ba8c663.1552910681.git.lucien.xin@gmail.com> In-Reply-To: <cover.1552910681.git.lucien.xin@gmail.com> References: <cover.1552910681.git.lucien.xin@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
| Series |
sctp: fix ignoring asoc_id for tcp-style sockets on some setsockopts
|
expand
|
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 10df48a..011c349 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4409,6 +4409,9 @@ static int sctp_setsockopt_scheduler(struct sock *sk, if (asoc) return sctp_sched_set_sched(asoc, params.assoc_value); + 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->default_ss = params.assoc_value;
A similar fix as Patch "sctp: fix ignoring asoc_id for tcp-style sockets on SCTP_DEFAULT_SEND_PARAM sockopt" on SCTP_STREAM_SCHEDULER sockopt. Fixes: 7efba10d6bd2 ("sctp: add SCTP_FUTURE_ASOC and SCTP_CURRENT_ASSOC for SCTP_STREAM_SCHEDULER sockopt") Signed-off-by: Xin Long <lucien.xin@gmail.com> --- net/sctp/socket.c | 3 +++ 1 file changed, 3 insertions(+)