From nobody Thu Jan 11 12:28:17 2024 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 4T9kTs2vrjz55bVr; Thu, 11 Jan 2024 12:28:17 +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 4T9kTs2NjDz43ZP; Thu, 11 Jan 2024 12:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976097; 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=dWtTpc2s3n6TcJt4HXgp/1rFE7cCnOI3xMuX0Y2Pqi0=; b=raGSpXEBi6rv4tAYsRC6uvBNkbpafOYZdnAP9wLNl5qHWdEwujxbg0AU26w9OAHxOSrC74 RRpc3rK2M1G99ZWUB2KTchlVuRskdX9tvsp4TW7owpX5UkOBh5QmI3+PYQs5R55U7K9Mt/ 4Wzo+imv/N9xk3v/EiS4ZMyvUEw2Lg45EL8Sz8Ajp3kNEpGOKsf0t+lCSYXA0m4kNidYwZ r3eD+DVwbqzZH7gLG/gXCPJquUEJJDJq2PHfGnQ7QuMjxJz5AhdLoRv/hr+RSD+IVED3ez eIFk/zB/8LWZ4U+NV/5OCXD3y9sLWv48spxPUimjjqrlDJjIGs50NOH3Vqm7Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704976097; 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=dWtTpc2s3n6TcJt4HXgp/1rFE7cCnOI3xMuX0Y2Pqi0=; b=K2QkE+AauIoUDLeK6+PYRzVPtlBRNZQKJgRcgWKJSmiOWsY9+w90uAJIiLxDIFDAqMTSih rMrb5VzcLmeBbVja4MGLJdACQr3SDozMdlzjB8pPIB3z5ZqG/+V227/t8FYjlwj5aSjEsv Z1Iyd4MgefjrxfzSdrB7CRx4JzH3YGt8x3YGiOy0hy3RQF+MFUkGQgDcMZ4JT/uweJOWNx OMcXN4l1+RpNUkRYAhSyyo+hK0w9AdVKcUdlgDjdR6ZKEk5zhbaGeV5Cz5Ko2Vb+/kNzhQ xqRFXSkam0drQw1DR2rqw+y8R9A19NYUR/gg0EBV0YkG1VDwnp+33goKfLmH+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704976097; a=rsa-sha256; cv=none; b=NPClEyAV0xQt+fdRogrroLvYzECJZ+XZaQh/mDgLafIZoB+6ZUp9IH2P+UTIg7U28r0MXH hB6PlDa8MYQPE2dSgN2vtfCd2GZc5q6t8XYCO0loIEvi0d4FivbiFq0MX/0+CQ5R5GQXQu Y5EfRhKEdTU99TxIP9srA+rH62+L7WrPrt8jsHZySAtQy5hMJa8qM0nOlZP/cik94o/gBX nfy9ClEoqC5+RqJ3LbI6MKZnQwE5IOgDvvneyOJviRqNUPUwYznluRwMCDdazFrv8Hvw+f +ytZDxLRC3qDs2j/GkyZyoXaW3N9wU0GDlCmT8SEK6WFhIvaFevw8BtuYA0vnQ== 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 4T9kTs1RNJzJXk; Thu, 11 Jan 2024 12:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40BCSHK1002010; Thu, 11 Jan 2024 12:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BCSHdA002007; Thu, 11 Jan 2024 12:28:17 GMT (envelope-from git) Date: Thu, 11 Jan 2024 12:28:17 GMT Message-Id: <202401111228.40BCSHdA002007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 553e395b7601 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 553e395b760191aa6c2c162b7737a8cdd9c933d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=553e395b760191aa6c2c162b7737a8cdd9c933d9 commit 553e395b760191aa6c2c162b7737a8cdd9c933d9 Author: Michael Tuexen AuthorDate: 2023-08-08 10:40:51 +0000 Commit: Michael Tuexen CommitDate: 2024-01-11 12:28:03 +0000 sctp: cleanup No functional change intended. (cherry picked from commit c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec) --- sys/netinet6/sctp6_usrreq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 151e1a0b9479..aeebe712b1ce 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -658,13 +658,6 @@ sctp6_close(struct socket *so) /* This could be made common with sctp_detach() since they are identical */ -static -int -sctp6_disconnect(struct socket *so) -{ - return (sctp_disconnect(so)); -} - int sctp_sendm(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, struct mbuf *control, struct thread *p); @@ -1208,7 +1201,7 @@ struct pr_usrreqs sctp6_usrreqs = { .pru_detach = sctp6_close, .pru_sopoll = sopoll_generic, .pru_flush = sctp_flush, - .pru_disconnect = sctp6_disconnect, + .pru_disconnect = sctp_disconnect, .pru_listen = sctp_listen, .pru_peeraddr = sctp6_getpeeraddr, .pru_send = sctp6_send,