The branch main has been updated by tuexen:
URL:
https://cgit.FreeBSD.org/src/commit/?id=bdd4630c9a9cea64830f981fc897ac953c48892c
commit bdd4630c9a9cea64830f981fc897ac953c48892c
Author: Michael Tuexen <tue...@freebsd.org>
AuthorDate: 2021-02-01 13:03:41 +0000
Commit: Michael Tuexen <tue...@freebsd.org>
CommitDate: 2021-02-01 13:04:57 +0000
sctp: small cleanup, no functional change intended.
MFC after: 3 days
---
sys/netinet/sctputil.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index 084b7bd6af72..319344842d5f 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2032,14 +2032,13 @@ sctp_timeout_handler(void *t)
sctp_inpcb_free(inp, SCTP_FREE_SHOULD_USE_ABORT,
SCTP_CALLED_FROM_INPKILL_TIMER);
inp = NULL;
- goto out_no_decr;
+ goto out_decr;
case SCTP_TIMER_TYPE_ASOCKILL:
KASSERT(inp != NULL && stcb != NULL && net == NULL,
("timeout of type %d: inp = %p, stcb = %p, net = %p",
type, inp, stcb, net));
SCTP_STAT_INCR(sctps_timoassockill);
/* Can we free it yet? */
- SCTP_INP_DECR_REF(inp);
sctp_timer_stop(SCTP_TIMER_TYPE_ASOCKILL, inp, stcb, NULL,
SCTP_FROM_SCTPUTIL + SCTP_LOC_1);
(void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC,
@@ -2049,7 +2048,7 @@ sctp_timeout_handler(void *t)
* duplicate unlock or unlock of a free mtx :-0
*/
stcb = NULL;
- goto out_no_decr;
+ goto out_decr;
case SCTP_TIMER_TYPE_ADDR_WQ:
KASSERT(inp == NULL && stcb == NULL && net == NULL,
("timeout of type %d: inp = %p, stcb = %p, net = %p",
@@ -2107,7 +2106,6 @@ out_decr:
if (net != NULL) {
sctp_free_remote_addr(net);
}
-out_no_decr:
SCTPDBG(SCTP_DEBUG_TIMER2, "Timer type %d handler finished.\n", type);
CURVNET_RESTORE();
NET_EPOCH_EXIT(et);
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
