Date: Mon, 26 Apr 2021 07:24:20 GMT From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 163153c2a080 - main - sctp: small cleanup, no functional change Message-ID: <202104260724.13Q7OKnn043484@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=163153c2a0809d2710e607463dcb24c7f795e156 commit 163153c2a0809d2710e607463dcb24c7f795e156 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2021-04-26 00:56:48 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> CommitDate: 2021-04-26 00:56:48 +0000 sctp: small cleanup, no functional change MFC: 3 days --- sys/netinet/sctp_input.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 43a2b06d1c79..5b4c3152da0d 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -3412,19 +3412,16 @@ sctp_find_stream_reset(struct sctp_tcb *stcb, uint32_t seq, struct sctp_tmit_chu int len, clen; asoc = &stcb->asoc; - if (TAILQ_EMPTY(&stcb->asoc.control_send_queue)) { - asoc->stream_reset_outstanding = 0; - return (NULL); - } - if (stcb->asoc.str_reset == NULL) { + chk = asoc->str_reset; + if (TAILQ_EMPTY(&asoc->control_send_queue) || + (chk == NULL)) { asoc->stream_reset_outstanding = 0; return (NULL); } - chk = stcb->asoc.str_reset; if (chk->data == NULL) { return (NULL); } - if (bchk) { + if (bchk != NULL) { /* he wants a copy of the chk pointer */ *bchk = chk; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104260724.13Q7OKnn043484>