git: 3d82a24ba1bc - stable/12 - pf: Remove unused variable rt_listid from struct pf_krule

[Kristof Provost]

The branch stable/12 has been updated by kp:

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

commit 3d82a24ba1bc90d8ac1cf9df8b13ccde42d8eb0a
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-04-08 09:08:33 +0000
Commit:     Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-05-07 08:15:59 +0000

    pf: Remove unused variable rt_listid from struct pf_krule
    
    Reviewed by:    donner
    MFC after:      4 weeks
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    Differential Revision:  https://reviews.freebsd.org/D29639
    
    (cherry picked from commit 4967f672ef3095300fe74a9d1ae873d0897cc0a5)
---
 sys/net/pfvar.h           | 1 -
 sys/netpfil/pf/pf_ioctl.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index a5ffba6c9d93..409e8fbefc5a 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -356,7 +356,6 @@ struct pf_krule {
 	}			 max_src_conn_rate;
 	u_int32_t		 qid;
 	u_int32_t		 pqid;
-	u_int32_t		 rt_listid;
 	u_int32_t		 nr;
 	u_int32_t		 prob;
 	uid_t			 cuid;
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 5663228ac5ac..342781fa6640 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -1547,7 +1547,6 @@ pf_krule_to_rule(const struct pf_krule *krule, struct pf_rule *rule)
 	rule->max_src_conn_rate.seconds = krule->max_src_conn_rate.seconds;
 	rule->qid = krule->qid;
 	rule->pqid = krule->pqid;
-	rule->rt_listid = krule->rt_listid;
 	rule->nr = krule->nr;
 	rule->prob = krule->prob;
 	rule->cuid = krule->cuid;
@@ -1681,7 +1680,6 @@ pf_rule_to_krule(const struct pf_rule *rule, struct pf_krule *krule)
 	krule->max_src_conn_rate.seconds = rule->max_src_conn_rate.seconds;
 	krule->qid = rule->qid;
 	krule->pqid = rule->pqid;
-	krule->rt_listid = rule->rt_listid;
 	krule->nr = rule->nr;
 	krule->prob = rule->prob;
 	krule->cuid = rule->cuid;