git: 9009d36afd1e - main - pf: shrink struct pf_kstate

[Mateusz Guzik]

The branch main has been updated by mjg:

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

commit 9009d36afd1e0107e1e5b6988f49436087b3d474
Author:     Mateusz Guzik <mjg at FreeBSD.org>
AuthorDate: 2021-07-19 12:35:31 +0000
Commit:     Mateusz Guzik <mjg at FreeBSD.org>
CommitDate: 2021-07-19 12:54:49 +0000

    pf: shrink struct pf_kstate
    
    Makes room for a pointer.
    
    Reviewed by:    kp
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/net/pfvar.h | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 297f26f1553d..1ed74e0781c9 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -597,6 +597,10 @@ struct pf_kstate {
 	 * end of the area
 	 */
 
+	u_int8_t		 state_flags;
+	u_int8_t		 timeout;
+	u_int8_t		 sync_state; /* PFSYNC_S_x */
+	u_int8_t		 sync_updates; /* XXX */
 	u_int			 refs;
 	TAILQ_ENTRY(pf_kstate)	 sync_list;
 	TAILQ_ENTRY(pf_kstate)	 key_list[2];
@@ -622,13 +626,6 @@ struct pf_kstate {
 	u_int32_t                pqid;
 	u_int16_t		 tag;
 	u_int8_t		 log;
-	u_int8_t		 state_flags;
-	u_int8_t		 timeout;
-	u_int8_t		 sync_state; /* PFSYNC_S_x */
-
-	/* XXX */
-	u_int8_t		 sync_updates;
-	u_int8_t		_tail[3];
 };
 
 /*