git: 57e0431da113 - stable/13 - sctp: small cleanup, no functional change

Michael Tuexen tuexen at FreeBSD.org
Sun Jun 6 23:27:19 UTC 2021


The branch stable/13 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=57e0431da1133daf59dd9d154ba17b7f15a71cdc

commit 57e0431da1133daf59dd9d154ba17b7f15a71cdc
Author:     Michael Tuexen <tuexen at FreeBSD.org>
AuthorDate: 2021-04-26 00:56:48 +0000
Commit:     Michael Tuexen <tuexen at FreeBSD.org>
CommitDate: 2021-06-02 21:38:17 +0000

    sctp: small cleanup, no functional change
    
    (cherry picked from commit 163153c2a0809d2710e607463dcb24c7f795e156)
---
 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;
 	}


More information about the dev-commits-src-all mailing list