git: 3232b1f4a9b4 - main - tcp: fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 17 Apr 2023 17:24:28 UTC
The branch main has been updated by glebius:
URL: https://cgit.FreeBSD.org/src/commit/?id=3232b1f4a9b4a23c5e0327144d65b3e5c83e725a
commit 3232b1f4a9b4a23c5e0327144d65b3e5c83e725a
Author: Gleb Smirnoff <glebius@FreeBSD.org>
AuthorDate: 2023-04-17 17:24:20 +0000
Commit: Gleb Smirnoff <glebius@FreeBSD.org>
CommitDate: 2023-04-17 17:24:20 +0000
tcp: fix build
The recent 25685b75375 came in conflict with a540cdca318. Remove the
code that cleans up the old style input queue. Note that two lines
below we assert that the new style input queue is empty. The TCP
stacks that use the queue are supposed to flush it in their
tfb_tcp_fb_fini method.
---
sys/netinet/tcp_subr.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index cc879999fe26..d88fc48fc021 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -2426,17 +2426,6 @@ tcp_discardcb(struct tcpcb *tp)
#ifdef TCP_BLACKBOX
tcp_log_tcpcbfini(tp);
#endif
- if (tp->t_in_pkt) {
- struct mbuf *m, *n;
-
- m = tp->t_in_pkt;
- tp->t_in_pkt = tp->t_tail_pkt = NULL;
- while (m) {
- n = m->m_nextpkt;
- m_freem(m);
- m = n;
- }
- }
TCPSTATES_DEC(tp->t_state);
if (tp->t_fb->tfb_tcp_fb_fini)