From nobody Thu Jan 04 13:40:14 2024 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 4T5SQ63QYlz56Q97; Thu, 4 Jan 2024 13:40:14 +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 4T5SQ62x4kz41L1; Thu, 4 Jan 2024 13:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704375614; 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=KhGh1HnhAOBiykt+o+MxKyaNe8unT/gWz+D3MjoI5BQ=; b=CmNZh1aQWJlwevpZPszd+Dxtrn/ijqZzdkhybPXNQzXqvkjztiVlqcPk9/4Wv44fD4SDDj yBGhaWWd2iquqwweC22ckFrCKFdARonaiILrrh9BJgkTAB+qzIHdnFLVlqBnBosDpKSEIr XwnaMcZDL4LOSeYb4vGuVJ5Cnb159GyEINmh1UEw6HJihDGVSAFsRI6kl1Ru2M4TP5H16E RvKvz4zLSIhDkNHPQ1hmb8Kwtv8SZmlLN3HUNBxo/iDa9wq0HKQAC4fo8O7Rt9DUSATbs9 mEzjBQffsfMKgpdReVEOUN0Ovh9KheNalkjCNNHMYxhH8smHoLh5fV5r8wWpcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704375614; 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=KhGh1HnhAOBiykt+o+MxKyaNe8unT/gWz+D3MjoI5BQ=; b=d2u7vrMX5js15wvEcfONMHKv5iMaa894b5RnxJ4KSU5rsaI52rtC2MQHOgtvofNZTRJIxL K1eUq6w3iZyR15MjKtlU0JTkLpizcjeY9IKaAO2SlP7Yk/+b5vh4fR5TakebsQysWz22/A b5PvCdk/XnMZKPjFiYU1qd6Cbm2vKWlOhUvuLXUyms93cKxg6EcBgNI4wlK38ieup/kxbz OJah6ePamBWBLLnjPOwL8NKbtQEYovt8PqzDgYqbvFc+Di48uwK451RvsUDabF4CAHnJkU sgH/tW6/v30HSp+xiGUBahKW/7utGfdCzx2QQ9PlSe1ozFx/51FiwXCabjNhwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704375614; a=rsa-sha256; cv=none; b=XTwTpvclB0rhgxsqZX+VnsoQjBJ4zpnFP3mTeGPV7sXwrcKcMtigj67GYUjz2CYrZAlX9p kpVVEDDVxMQcyojXaVxWS0VCMoZkEOY3uI34oQPcNrKc5H2sZe/6D9D5m5nVxsBf0m7+I4 gmqMyry17EjRFeOzBwJgEnnjmsBmkF/olwP7eZWE7dF5nrDPJX6OYEthwwQRbLrrYVi03l 5snC+LeiZKLqEjYZo8tx1uEyP8aDyeO3wghKdqS7Fq6KmSPzHZeoSei5XXrCrRKRYYyB0v QVnbO4DKxhsIbjoqQKs4ag+kqlMRFF9oDMEa4xBl+r3CJ+aQO3zYvFeUyQNVQg== 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 4T5SQ61zqxzFqN; Thu, 4 Jan 2024 13:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 404DeENu039542; Thu, 4 Jan 2024 13:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 404DeEJD039534; Thu, 4 Jan 2024 13:40:14 GMT (envelope-from git) Date: Thu, 4 Jan 2024 13:40:14 GMT Message-Id: <202401041340.404DeEJD039534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8d01ecd8e9da - main - frag6: Add another use of frag6_rmqueue() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d01ecd8e9da5192a8b2dfb6c7d58b4aae9ea358 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8d01ecd8e9da5192a8b2dfb6c7d58b4aae9ea358 commit 8d01ecd8e9da5192a8b2dfb6c7d58b4aae9ea358 Author: Mark Johnston AuthorDate: 2024-01-04 13:11:19 +0000 Commit: Mark Johnston CommitDate: 2024-01-04 13:39:52 +0000 frag6: Add another use of frag6_rmqueue() No functional change intended. Reviewed by: kp, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43256 --- sys/netinet6/frag6.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c index fbdbc3ef2f28..e976298bf984 100644 --- a/sys/netinet6/frag6.c +++ b/sys/netinet6/frag6.c @@ -862,10 +862,6 @@ postinsert: ip6->ip6_flow |= htonl(IPTOS_ECN_CE << 20); nxt = q6->ip6q_nxt; - TAILQ_REMOVE(head, q6, ip6q_tq); - V_ip6qb[bucket].count--; - atomic_subtract_int(&frag6_nfrags, q6->ip6q_nfrag); - ip6_deletefraghdr(m, offset, M_NOWAIT); /* Set nxt(-hdr field value) to the original value. */ @@ -874,10 +870,9 @@ postinsert: #ifdef MAC mac_ip6q_reassemble(q6, m); - mac_ip6q_destroy(q6); #endif - free(q6, M_FRAG6); - atomic_subtract_int(&V_frag6_nfragpackets, 1); + atomic_subtract_int(&frag6_nfrags, q6->ip6q_nfrag); + frag6_rmqueue(q6, bucket); if (m->m_flags & M_PKTHDR) { /* Isn't it always true? */