Date: Tue, 7 Dec 2021 15:39:18 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 22d368ca46eb - stable/12 - pf: remove unused variables Message-ID: <202112071539.1B7FdIh6034254@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=22d368ca46ebff4d75a7ddf0af2f115084f3939c commit 22d368ca46ebff4d75a7ddf0af2f115084f3939c Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2021-11-22 19:30:22 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2021-12-07 08:05:02 +0000 pf: remove unused variables No functional change intended. Reviewed by: glebius MFC after: 2 weeks Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D33085 (cherry picked from commit c36f90417b734e56ef938cc2d19601001c709f40) --- sys/netpfil/pf/pf.c | 3 --- sys/netpfil/pf/pf_norm.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5ec25baee419..ea658e33bbb6 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4926,7 +4926,6 @@ pf_test_state_tcp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, int copyback = 0; int action; struct pf_state_peer *src, *dst; - struct pf_state_key *sk; bzero(&key, sizeof(key)); key.af = pd->af; @@ -4953,8 +4952,6 @@ pf_test_state_tcp(struct pf_kstate **state, int direction, struct pfi_kkif *kif, dst = &(*state)->src; } - sk = (*state)->key[pd->didx]; - if ((action = pf_synproxy(pd, state, reason)) != PF_PASS) return (action); diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 40e4b1bae2f9..ec063f82c1d9 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1027,7 +1027,6 @@ pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kkif *kif, u_short *reason u_int16_t fragoff = (ntohs(h->ip_off) & IP_OFFMASK) << 3; u_int16_t max; int ip_len; - int ip_off; int tag = -1; int verdict; @@ -1100,7 +1099,6 @@ pf_normalize_ip(struct mbuf **m0, int dir, struct pfi_kkif *kif, u_short *reason } ip_len = ntohs(h->ip_len) - hlen; - ip_off = (ntohs(h->ip_off) & IP_OFFMASK) << 3; /* All fragments are 8 byte aligned */ if (mff && (ip_len & 0x7)) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112071539.1B7FdIh6034254>