From owner-dev-commits-src-branches@freebsd.org Fri May 7 15:25:35 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7CB15630EEF; Fri, 7 May 2021 15:25:35 +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 4FcDmH35r6z4k1V; Fri, 7 May 2021 15:25:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5D3B8576F; Fri, 7 May 2021 15:25:35 +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 147FPZdw025798; Fri, 7 May 2021 15:25:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 147FPZQm025797; Fri, 7 May 2021 15:25:35 GMT (envelope-from git) Date: Fri, 7 May 2021 15:25:35 GMT Message-Id: <202105071525.147FPZQm025797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 95a06e369e5d - stable/13 - pf: Remove unused variable rt_listid from struct pf_krule MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95a06e369e5d995e235a4bf45f308770360df801 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 May 2021 15:25:35 -0000 The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=95a06e369e5d995e235a4bf45f308770360df801 commit 95a06e369e5d995e235a4bf45f308770360df801 Author: Kristof Provost AuthorDate: 2021-04-08 09:08:33 +0000 Commit: Kristof Provost CommitDate: 2021-05-07 08:15:40 +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 2039e3277321..17f6020513bd 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 3161c6b1f7c9..8ac534e0d58b 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -1546,7 +1546,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; @@ -1680,7 +1679,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;