git: e79dff84b111 - stable/13 - sctp: cleanup, no functional change intended
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 22 Feb 2022 22:50:56 UTC
The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e79dff84b11179dcaeb11e90f1de73235b6675f2 commit e79dff84b11179dcaeb11e90f1de73235b6675f2 Author: Michael Tuexen <tuexen@FreeBSD.org> AuthorDate: 2021-09-15 08:18:11 +0000 Commit: Michael Tuexen <tuexen@FreeBSD.org> CommitDate: 2022-02-22 22:50:33 +0000 sctp: cleanup, no functional change intended (cherry picked from commit 454216468583481746845a1c8a45a8c18898ee72) --- sys/netinet/sctp_asconf.c | 1 - sys/netinet/sctp_input.c | 5 ++--- sys/netinet/sctp_timer.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c index 0915e187ee40..2250d084ca06 100644 --- a/sys/netinet/sctp_asconf.c +++ b/sys/netinet/sctp_asconf.c @@ -2195,7 +2195,6 @@ sctp_asconf_iterator_stcb(struct sctp_inpcb *inp, struct sctp_tcb *stcb, return; else continue; - break; } if (type == SCTP_ADD_IP_ADDRESS) { diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index aeef68899b5f..a9c5c7116e8a 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -1975,7 +1975,6 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset, union sctp_sockstore store; struct sctp_association *asoc; int init_offset, initack_offset, initack_limit; - int retval; int error = 0; uint8_t auth_chunk_buf[SCTP_CHUNK_BUFFER_SIZE]; @@ -2088,9 +2087,9 @@ sctp_process_cookie_new(struct mbuf *m, int iphlen, int offset, return (NULL); } /* load all addresses */ - if ((retval = sctp_load_addresses_from_init(stcb, m, + if (sctp_load_addresses_from_init(stcb, m, init_offset + sizeof(struct sctp_init_chunk), - initack_offset, src, dst, init_src, port)) < 0) { + initack_offset, src, dst, init_src, port) < 0) { (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_INPUT + SCTP_LOC_20); return (NULL); diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index 4866356bdf5c..e657bc280ccc 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -330,7 +330,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, } /* Look for an alternate net, which is active. */ if ((net != NULL) && ((net->dest_state & SCTP_ADDR_BEING_DELETED) == 0)) { - alt = TAILQ_NEXT(net, sctp_next);; + alt = TAILQ_NEXT(net, sctp_next); } else { alt = TAILQ_FIRST(&stcb->asoc.nets); } @@ -369,7 +369,7 @@ sctp_find_alternate_net(struct sctp_tcb *stcb, * an alternate net, which is confirmed. */ if ((net != NULL) && ((net->dest_state & SCTP_ADDR_BEING_DELETED) == 0)) { - alt = TAILQ_NEXT(net, sctp_next);; + alt = TAILQ_NEXT(net, sctp_next); } else { alt = TAILQ_FIRST(&stcb->asoc.nets); }