From nobody Tue Aug 8 10:43:07 2023 X-Original-To: dev-commits-src-main@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 4RKqXW4HtXz4m8tb; Tue, 8 Aug 2023 10:43:07 +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 4RKqXW3Z2zz4XT1; Tue, 8 Aug 2023 10:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691491387; 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=YUmRKm5szUcYGVVnJ37dd9Xcvlg7xY2gaz+lNcVQn8I=; b=RFBsC6I1ixT8CrVut/4223DlLowf0sPgzz8MBNIvGGHMg7zkFK+rffX3+zEkC3Fb0ax8b0 0jHD6JhaZORAYHsOkEAPBy/GNu2zhMzKQCk+dY1XGj4p12qAoj9ocFVSWzxmxHadQ9Iya7 swsaK129Bg0kJph1qUJY2XZ/zAuEMlPdHw6E6lNy6bHAQOu93HTbjzgRXz1KX7iE61BM0G vhdc0x0rNS5IN9u5vB55AvfXAD49xXNKuC+1xM1ERO2rgOIOj2VJxJz8OMGIVJYCLqT719 viuiDfckhJV5ecjcC3jfthwiTkGvoaGl2MTDuvRpytCfwb35FbXne8oFuI02Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691491387; 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=YUmRKm5szUcYGVVnJ37dd9Xcvlg7xY2gaz+lNcVQn8I=; b=SaCSyXA7GCMG5jScrCVKXqqHQQ7gGpaR2t9h8x4rN0ZfkpKfJmJ5+5TWANI+oo28wlTWgS 6RG77EWjNEXDZW1bO6aj5Op2Yz1WVK7yqqJ4WOHfZTvWRyHPfYHf1KleoRBMG8R3/AnLjE HuTyzPYitZlny/a+GC5Aa1l9wMj13VxEMBYpFZEh4ned2tFNXfHymwrFLdK8kw81yBzuVE yex13F4VxsxiJ9hdhq4VKo+THoItP1D4iqQcfIGu/EwrQKSLIWodVQU4FdANesJ72QBXW0 9gkvFUx1O2ylvB1DTqwSDE9WlHQTyLkSXSznRcIFFizJu6Uzg76cQFjtXReReQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691491387; a=rsa-sha256; cv=none; b=DRpUVqzqi1MHjgcKWH1CQDfGQBgpHXLcubsQU7y8kwdHXYCe4IOM8wj9drvOjKrKm+Vlx8 R5WAvkrD+gyQvIgxT5u5NMvrgUqABOitVznw18y2hmg4oANaP8hF7cG2EZrMB61Jjhgpm8 woU9gjnV81h6JC651En7HgNny5xNNyJU3B/oeI1qIB7JRZCik+gS/BnlIBwKm/1nValwLZ iatac8bGkPR07GOIGGphmtvlfCJZIQzBuelYaV/bd43RTB/c1BiFIE/Y17bLclZrfpQ4PF 26i2Z0afsCBWqsuEZS37/38zk4n15wT/0O7PKKPiIP30Fkj6fExobEgRkiJbWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKqXW2d1yzX0f; Tue, 8 Aug 2023 10:43:07 +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 378Ah712058000; Tue, 8 Aug 2023 10:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378Ah7Oh057999; Tue, 8 Aug 2023 10:43:07 GMT (envelope-from git) Date: Tue, 8 Aug 2023 10:43:07 GMT Message-Id: <202308081043.378Ah7Oh057999@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: c7587f7a3f8d - main - sctp: cleanup List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec commit c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec Author: Michael Tuexen AuthorDate: 2023-08-08 10:40:51 +0000 Commit: Michael Tuexen CommitDate: 2023-08-08 10:40:51 +0000 sctp: cleanup No functional change intended. MFC after: 1 week --- 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 4e8bfaa191eb..a105b2897c6c 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -632,13 +632,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); @@ -1184,7 +1177,7 @@ sctp6_getpeeraddr(struct socket *so, struct sockaddr **nam) .pr_detach = sctp6_close, \ .pr_sopoll = sopoll_generic, \ .pr_flush = sctp_flush, \ - .pr_disconnect = sctp6_disconnect, \ + .pr_disconnect = sctp_disconnect, \ .pr_listen = sctp_listen, \ .pr_peeraddr = sctp6_getpeeraddr, \ .pr_send = sctp6_send, \