git: c36f90417b73 - main - pf: remove unused variables
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 23 Nov 2021 17:48:11 UTC
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=c36f90417b734e56ef938cc2d19601001c709f40
commit c36f90417b734e56ef938cc2d19601001c709f40
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2021-11-22 19:30:22 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2021-11-23 15:44:37 +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
---
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 8891ac75330a..1ddb61836e2e 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -4946,7 +4946,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;
@@ -4973,8 +4972,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 8e14fa35bf59..5827fb0b093b 100644
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -1031,7 +1031,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;
@@ -1104,7 +1103,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)) {