Date: Sun, 5 May 2019 20:14:37 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r347166 - stable/11/sys/netinet Message-ID: <201905052014.x45KEbSF075676@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Sun May 5 20:14:36 2019 New Revision: 347166 URL: https://svnweb.freebsd.org/changeset/base/347166 Log: MFC r337737: Remove a set but not used warning showing up in usrsctp. Modified: stable/11/sys/netinet/sctp_input.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/netinet/sctp_input.c ============================================================================== --- stable/11/sys/netinet/sctp_input.c Sun May 5 20:08:01 2019 (r347165) +++ stable/11/sys/netinet/sctp_input.c Sun May 5 20:14:36 2019 (r347166) @@ -3232,7 +3232,6 @@ static void sctp_handle_shutdown_complete(struct sctp_shutdown_complete_chunk *cp SCTP_UNUSED, struct sctp_tcb *stcb, struct sctp_nets *net) { - struct sctp_association *asoc; #if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) struct socket *so; #endif @@ -3242,7 +3241,6 @@ sctp_handle_shutdown_complete(struct sctp_shutdown_com if (stcb == NULL) return; - asoc = &stcb->asoc; /* process according to association state */ if (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT) { /* unexpected SHUTDOWN-COMPLETE... so ignore... */ @@ -3256,8 +3254,8 @@ sctp_handle_shutdown_complete(struct sctp_shutdown_com sctp_ulp_notify(SCTP_NOTIFY_ASSOC_DOWN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } #ifdef INVARIANTS - if (!TAILQ_EMPTY(&asoc->send_queue) || - !TAILQ_EMPTY(&asoc->sent_queue) || + if (!TAILQ_EMPTY(&stcb->asoc.send_queue) || + !TAILQ_EMPTY(&stcb->asoc.sent_queue) || sctp_is_there_unsent_data(stcb, SCTP_SO_NOT_LOCKED)) { panic("Queues are not empty when handling SHUTDOWN-COMPLETE"); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905052014.x45KEbSF075676>