==== //depot/user/rwatson/netperf/sys/netinet/tcp_input.c#33 - /home/rwatson/p4/rwatson_netperf/sys/netinet/tcp_input.c ====
@@ -1164,7 +1164,6 @@
 			     ((tcp_do_newreno || tp->sack_enable) &&
 			      !IN_FASTRECOVERY(tp)))) {
 				KASSERT(headlocked, ("headlocked"));
-				INP_INFO_WUNLOCK(&tcbinfo);
 				/*
 				 * this is a pure ack for outstanding data.
 				 */
@@ -1253,7 +1252,6 @@
 		    LIST_EMPTY(&tp->t_segq) &&
 		    tlen <= sbspace(&so->so_rcv)) {
 			KASSERT(headlocked, ("headlocked"));
-			INP_INFO_WUNLOCK(&tcbinfo);
 			/*
 			 * this is a pure, in-sequence data packet
 			 * with nothing on the reassembly queue and
@@ -2503,7 +2501,6 @@
 			break;
 		}
 	}
-	INP_INFO_WUNLOCK(&tcbinfo);
 #ifdef TCPDEBUG
 	if (so->so_options & SO_DEBUG)
 		tcp_trace(TA_INPUT, ostate, tp, (void *)tcp_saveipgen,
@@ -2517,6 +2514,7 @@
 		(void) tcp_output(tp);
 
 check_delack:
+	KASSERT(headlocked == 1, ("headlocked should be 1"));
 	INP_LOCK_ASSERT(inp);
 	if (tp->t_flags & TF_DELACK) {
 		tp->t_flags &= ~TF_DELACK;
@@ -2524,6 +2522,7 @@
 		    tcp_timer_delack, tp);
 	}
 	INP_UNLOCK(inp);
+	INP_INFO_WUNLOCK(&tcbinfo);
 	return;
 
 dropafterack:
@@ -2554,11 +2553,11 @@
 			  &tcp_savetcp, 0);
 #endif
 	KASSERT(headlocked, ("headlocked should be 1"));
-	INP_INFO_WUNLOCK(&tcbinfo);
-	m_freem(m);
 	tp->t_flags |= TF_ACKNOW;
 	(void) tcp_output(tp);
 	INP_UNLOCK(inp);
+	INP_INFO_WUNLOCK(&tcbinfo);
+	m_freem(m);
 	return;
 
 dropwithreset:
@@ -2623,9 +2622,9 @@
 #endif
 	if (tp)
 		INP_UNLOCK(inp);
-	m_freem(m);
 	if (headlocked)
 		INP_INFO_WUNLOCK(&tcbinfo);
+	m_freem(m);
 	return;
 }