Index: sys/netinet/tcp_input.c
===================================================================
--- sys/netinet/tcp_input.c
+++ sys/netinet/tcp_input.c
@@ -2315,8 +2315,7 @@
 	 * If new data are received on a connection after the
 	 * user processes are gone, then RST the other end.
 	 */
-	if ((so->so_state & SS_NOFDREF) &&
-	    tp->t_state > TCPS_CLOSE_WAIT && tlen) {
+	if ((tp->t_flags & TF_CLOSED) && tlen) {
 		if ((s = tcp_log_addrs(inc, th, NULL, NULL))) {
 			log(LOG_DEBUG, "%s; %s: %s: Received %d bytes of data "
 			    "after socket was closed, "
Index: sys/netinet/tcp_stacks/bbr.c
===================================================================
--- sys/netinet/tcp_stacks/bbr.c
+++ sys/netinet/tcp_stacks/bbr.c
@@ -9493,15 +9493,12 @@
 	/*
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
+	 * We call a new function now so we might continue and setup
+	 * to reset at all data being ack'd.
 	 */
-	if ((so->so_state & SS_NOFDREF) && tlen) {
-		/*
-		 * We call a new function now so we might continue and setup
-		 * to reset at all data being ack'd.
-		 */
-		if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -9620,15 +9617,12 @@
 	/*
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
+	 * We call a new function now so we might continue and setup
+	 * to reset at all data being ack'd.
 	 */
-	if ((so->so_state & SS_NOFDREF) && tlen) {
-		/*
-		 * We call a new function now so we might continue and setup
-		 * to reset at all data being ack'd.
-		 */
-		if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -9733,15 +9727,12 @@
 	/*
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
+	 * We call a new function now so we might continue and setup
+	 * to reset at all data being ack'd.
 	 */
-	if ((so->so_state & SS_NOFDREF) && tlen) {
-		/*
-		 * We call a new function now so we might continue and setup
-		 * to reset at all data being ack'd.
-		 */
-		if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -9850,17 +9841,12 @@
 	 * If new data are received on a connection after the user processes
 	 * are gone, then we may RST the other end depending on the outcome
 	 * of bbr_check_data_after_close.
+	 * We call a new function now so we might continue and setup
+	 * to reset at all data being ack'd.
 	 */
-	if ((so->so_state & SS_NOFDREF) &&
-	    tlen) {
-		/*
-		 * We call a new function now so we might continue and setup
-		 * to reset at all data being ack'd.
-		 */
-		if (bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
-			return (1);
-	}
-	INP_WLOCK_ASSERT(tp->t_inpcb);
+	if (tp->t_state > TCPS_CLOSE_WAIT && tlen &&
+	    bbr_check_data_after_close(m, bbr, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
Index: sys/netinet/tcp_stacks/rack.c
===================================================================
--- sys/netinet/tcp_stacks/rack.c
+++ sys/netinet/tcp_stacks/rack.c
@@ -11855,10 +11855,9 @@
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
 	 */
-	if ((so->so_state & SS_NOFDREF) && tlen) {
-		if (rack_check_data_after_close(m, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    rack_check_data_after_close(m, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -11983,10 +11982,9 @@
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
 	 */
-	if ((so->so_state & SS_NOFDREF) && tlen) {
-		if (rack_check_data_after_close(m, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    rack_check_data_after_close(m, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -12097,10 +12095,9 @@
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
 	 */
-	if ((so->so_state & SS_NOFDREF) && tlen) {
-		if (rack_check_data_after_close(m, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    rack_check_data_after_close(m, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
@@ -12212,11 +12209,9 @@
 	 * If new data are received on a connection after the user processes
 	 * are gone, then RST the other end.
 	 */
-	if ((so->so_state & SS_NOFDREF) &&
-	    tlen) {
-		if (rack_check_data_after_close(m, tp, &tlen, th, so))
-			return (1);
-	}
+	if ((tp->t_flags & TF_CLOSED) && tlen &&
+	    rack_check_data_after_close(m, tp, &tlen, th, so))
+		return (1);
 	/*
 	 * If last ACK falls within this segment's sequence numbers, record
 	 * its timestamp. NOTE: 1) That the test incorporates suggestions
Index: sys/netinet/tcp_usrreq.c
===================================================================
--- sys/netinet/tcp_usrreq.c
+++ sys/netinet/tcp_usrreq.c
@@ -1407,6 +1407,7 @@
 	if (!(inp->inp_flags & INP_TIMEWAIT) &&
 	    !(inp->inp_flags & INP_DROPPED)) {
 		tp = intotcpcb(inp);
+		tp->t_flags |= TF_CLOSED;
 		TCPDEBUG1();
 		tcp_disconnect(tp);
 		TCPDEBUG2(PRU_CLOSE);
Index: sys/netinet/tcp_var.h
===================================================================
--- sys/netinet/tcp_var.h
+++ sys/netinet/tcp_var.h
@@ -524,7 +524,7 @@
 #define	TF_FORCEDATA	0x00800000	/* force out a byte */
 #define	TF_TSO		0x01000000	/* TSO enabled on this connection */
 #define	TF_TOE		0x02000000	/* this connection is offloaded */
-#define	TF_UNUSED0	0x04000000	/* unused */
+#define	TF_CLOSED	0x04000000	/* close(2) called on socket */
 #define	TF_UNUSED1	0x08000000	/* unused */
 #define	TF_LRD		0x10000000	/* Lost Retransmission Detection */
 #define	TF_CONGRECOVERY	0x20000000	/* congestion recovery mode */