The branch stable/14 has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e4db787bb86b2d7b26ed241df47e6ea03dded2ef

commit e4db787bb86b2d7b26ed241df47e6ea03dded2ef
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-01-04 13:11:19 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-01-11 14:22:14 +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
    
    (cherry picked from commit 8d01ecd8e9da5192a8b2dfb6c7d58b4aae9ea358)
---
 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? */
 

Reply via email to