From nobody Sat Apr 16 19:03:52 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3FFBDEAA8E8; Sat, 16 Apr 2022 19:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KgjKP1N30z3C3Y; Sat, 16 Apr 2022 19:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650135833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FiITLrg3GqYgNtv7W7dR9hN+pIbqPAJWa//xSGxGZU4=; b=B9+xdj4eWS9WYPmBEbhR3VJltCNYBUrrweEEGSKoTIrvQJaursSgWICxKltLMhlECkX1m1 fVNZ8d4+aptKu8Ig/MzBrgRRTttQOrI1vYwbRTLhDtLxouGE8gY8eFDKdYKlj8apyUK19Y yj4eI0FMAST3EXwmV6e9U9tGstHbIKiK+BOcUh6nLH3sxPhJu1FrySG0BtvOABx7Lk7nBP EAlK4nRC//98d9Dv1RS+ux3IqqhlTPDXrHvM4BCDt1mw9Bh9aKZsx3b/MdjsOdebIlFbgd NZQ7qDXa+5SDjVWu7yut4FRmXqibG+0lfkpew6SfsoqOLzlZZGu65yw8/vHi9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0EEDD76CC; Sat, 16 Apr 2022 19:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23GJ3qh5096978; Sat, 16 Apr 2022 19:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23GJ3qgr096977; Sat, 16 Apr 2022 19:03:52 GMT (envelope-from git) Date: Sat, 16 Apr 2022 19:03:52 GMT Message-Id: <202204161903.23GJ3qgr096977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: bbf3bf32116b - main - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbf3bf32116b0b1ff28a19ec0bc2dbcf23b6a94c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650135833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FiITLrg3GqYgNtv7W7dR9hN+pIbqPAJWa//xSGxGZU4=; b=wpeJtjAZoRZpeSCUKyksC6q/2VvAn5ej5vr0jFQC/0H06s2k/TSnmMp+U5jQi9lB+91eP9 FdQ4npaiBIkOPA2rIbtb4a318Kr5q7/EkfEbJhQ+XEiFAHq93eMi2utNbFJ4Q7hdOzI7OQ 7laA1a5/LaOGU2/zKznq1HWXtSqbeDsBpEUIwvlzwM2FqJw7zqJXNlu+lnzskjzG+PjHxD F7UWiNg6zciSjicewoCS+cvFOww/rc5Evra7YWIETWpI6lEux+oqSRj0lIam/739Ykw1rj 2KNzJ6PgbNr6Aog1jNoxsWYnbk91qXmGY7kRqgZle2qlnpLsdJ9o6ZGGjn48Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650135833; a=rsa-sha256; cv=none; b=dj9Z1skxDVs1Ykx25TFPRiJzdbvIiljw/jLl2rvdh78A5OUUrA8GItX0HNKkiwTkqH//RO jMibLtLwdgWEEvRRWiduA1e2DtKHd4sQQMpptCUYQhT5F5fIGaOLo4a/by62DLLqKlEU9p EdPTKVOUrLKofVbPcY131kdt91wq+YAoe1OCrbeH4OW3U0HpW48D2knxpQKkJHJI+9nhpS JwOCH0D/yoA8luE+hbKj+Kj4cMRfAOXzviwYrqQma30AzZLR5hqm5lS5ftsW+2ttF0tXnT cAd1EyvNA0CP2+3nDFgXHHS3JekTgmW4ygZPnBtky50T7Tc0KY1eSFR8MMJ4LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf3bf32116b0b1ff28a19ec0bc2dbcf23b6a94c commit bbf3bf32116b0b1ff28a19ec0bc2dbcf23b6a94c Author: Michael Tuexen AuthorDate: 2022-04-16 19:03:16 +0000 Commit: Michael Tuexen CommitDate: 2022-04-16 19:03:16 +0000 sctp: cleanup MFC after: 3 days --- sys/netinet/sctputil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 6c62a083458f..8c96a832827a 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4838,7 +4838,7 @@ sctp_wakeup_the_read_socket(struct sctp_inpcb *inp, { if ((inp != NULL) && (inp->sctp_socket != NULL) && - (((stcb->sctp_ep->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) == 0) || + (((inp->sctp_flags & (SCTP_PCB_FLAGS_TCPTYPE | SCTP_PCB_FLAGS_IN_TCPPOOL)) == 0) || !SCTP_IS_LISTENING(inp))) { sctp_sorwakeup(inp, inp->sctp_socket); }