D45990.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45990.diff
View Options

	diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
	--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
	+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
	@@ -1393,6 +1393,7 @@

	case TCPS_FIN_WAIT_2:
	restore_so_proto(so, inp->inp_vflag & INP_IPV6);
	+ t4_pcb_detach(NULL, tp);
	tcp_twstart(tp);
	INP_UNLOCK_ASSERT(inp); /* safe, we have a ref on the inp */
	NET_EPOCH_EXIT(et);
	@@ -1454,6 +1455,7 @@
	switch (tp->t_state) {
	case TCPS_CLOSING: /* see TCPS_FIN_WAIT_2 in do_peer_close too */
	restore_so_proto(so, inp->inp_vflag & INP_IPV6);
	+ t4_pcb_detach(NULL, tp);
	tcp_twstart(tp);
	release:
	INP_UNLOCK_ASSERT(inp); /* safe, we have a ref on the inp */
	diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h
	--- a/sys/dev/cxgbe/tom/t4_tom.h
	+++ b/sys/dev/cxgbe/tom/t4_tom.h
	@@ -468,6 +468,7 @@
	uint64_t select_ntuple(struct vi_info , struct l2t_entry );
	int negative_advice(int);
	int add_tid_to_history(struct adapter *, u_int);
	+void t4_pcb_detach(struct toedev , struct tcpcb );

	/* t4_connect.c */
	void t4_init_connect_cpl_handlers(void);
	diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
	--- a/sys/dev/cxgbe/tom/t4_tom.c
	+++ b/sys/dev/cxgbe/tom/t4_tom.c
	@@ -359,7 +359,7 @@
	* Also gets called when an offloaded active open fails and the TOM wants the
	* kernel to take the TCP PCB back.
	*/
	-static void
	+void
	t4_pcb_detach(struct toedev tod __unused, struct tcpcb tp)
	{
	#if defined(KTR) \|\| defined(INVARIANTS)