From nobody Mon Apr 17 17:24:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0Ynn0ld5z44wtl; Mon, 17 Apr 2023 17:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0Ynm6thHz3lxb; Mon, 17 Apr 2023 17:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681752269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnma2LMLacCdFrj9txUNzZ0UngLi7EqGi51wrOAtoZ4=; b=TCokihSiM/wwin9pKGgvmpKnHihAEnSfQ4dRDOlmsU2HGpbeuF16qkPkHd1gQv6Y8W1s+s O3QKBg9Sn4W1rAwlhOnZMdpcMkwXq2LCLROWW0Bnz/oQMUe1oLhhdEslU7asCJTiSdgpiM OCiSJ7/Py6jc+odAfA8FUnWp+WwqLx/eOGbrbRnSRB/loOLHiZFht7/qeMSTgImhN/lxMk EQQ0etyU3YrlGhVqizDBE8KZ71pssSbPDPvFAxghHzoelCNQ/tlRFl4STLJJHRBux5js9e 9oPGFdjQupx6Xv19nm8UNdoAz70HH8/g5U3iCIYyuBg7yPWXkIjGzchlcnHqvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681752269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnma2LMLacCdFrj9txUNzZ0UngLi7EqGi51wrOAtoZ4=; b=aGj3Q9tW/8D65zBnOW3QKIbieRxP6IyS7XxdU+1tr801+16/F6cUTqpk6ZUn5/RwrzeztX sE16mwUiwE5pvJWlzDNZi58SwN7zQLDfkT/WbUxDFUC7eaoMweh8Nsy1rI1nJgI40ZGTUn dD16Y4JS4E/54DO3XjUuuExoCoHbmz/yCe/f+404YK77vRfUFefkNcryGMpMBjrP9CD37P mBjSK6l1J17XrT6b8/rmjjsPW/NjPDfpryNBCe8m51zw+RVzs8pOv634x2VC1KclPtO4qC +beBhPauDFKdq78uyRSZu9tkE6Vk9I2mUOtkNvo6eBO9gPewwl/5hGDwGdl9gQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681752269; a=rsa-sha256; cv=none; b=p7jLk768HN/xSwS47+Sm3WFfRGwqgSvfw6FhjEZDddCEJ3NJFB8h79rOBtC+8o/Rx6r+ip dl4k03Wf/9LV6YFAk+v/6Q/Rhg/oRpr9cCyvTzvolTsNLr7d7sIfusgW+BFTfz6BG5JFVc gY+9sH3anZZdOo7jDipLDACudC8OSr9VXwZtG3hI5nGNSOlSgoP/yv4rpOGq4IHJvOAvL8 msFkn35AzbtKpnO/ghgzBNYBfOV9n2sMFNRiwk3hkr38YClI68hRtAI8XAvH5ohbyIw17a xZKsV0Z9OmGfo6M2JU2w38SmQOAG3NnjzmJoSx5ovFEws6o2DoT6NhXeeVWeQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q0Ynm5phJzdTq; Mon, 17 Apr 2023 17:24:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33HHOSlb034593; Mon, 17 Apr 2023 17:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33HHOSjf034592; Mon, 17 Apr 2023 17:24:28 GMT (envelope-from git) Date: Mon, 17 Apr 2023 17:24:28 GMT Message-Id: <202304171724.33HHOSjf034592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3232b1f4a9b4 - main - tcp: fix build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3232b1f4a9b4a23c5e0327144d65b3e5c83e725a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3232b1f4a9b4a23c5e0327144d65b3e5c83e725a commit 3232b1f4a9b4a23c5e0327144d65b3e5c83e725a Author: Gleb Smirnoff AuthorDate: 2023-04-17 17:24:20 +0000 Commit: Gleb Smirnoff 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)