svn commit: r337737 - head/sys/netinet

Michael Tuexen tuexen at FreeBSD.org
Tue Aug 14 08:32:34 UTC 2018


Author: tuexen
Date: Tue Aug 14 08:32:33 2018
New Revision: 337737
URL: https://svnweb.freebsd.org/changeset/base/337737

Log:
  Remove a set but not used warning showing up in usrsctp.

Modified:
  head/sys/netinet/sctp_input.c

Modified: head/sys/netinet/sctp_input.c
==============================================================================
--- head/sys/netinet/sctp_input.c	Tue Aug 14 07:54:14 2018	(r337736)
+++ head/sys/netinet/sctp_input.c	Tue Aug 14 08:32:33 2018	(r337737)
@@ -3231,7 +3231,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
@@ -3241,7 +3240,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... */
@@ -3255,8 +3253,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");
 	}


More information about the svn-src-all mailing list