From nobody Tue Nov 23 17:48:11 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7DCB4188E319; Tue, 23 Nov 2021 17:48:11 +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 4HzBSW1s6hz4gwN; Tue, 23 Nov 2021 17:48:11 +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 19F301A97E; Tue, 23 Nov 2021 17:48:11 +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 1ANHmB55095349; Tue, 23 Nov 2021 17:48:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANHmBm1095348; Tue, 23 Nov 2021 17:48:11 GMT (envelope-from git) Date: Tue, 23 Nov 2021 17:48:11 GMT Message-Id: <202111231748.1ANHmBm1095348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c36f90417b73 - main - pf: remove unused variables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: c36f90417b734e56ef938cc2d19601001c709f40 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637689691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I60F4LmoZqV6jylILxtNTFFYHo9P9Y6pI3QYV/PvuPA=; b=tgAKtvieQwGztTM5H1ZgyKXU9efI+9/jmMS3zHSsIU0D3ePPgQaIOvR/krL5JysACjH145 cDojThxXlDRtdL4DcMlTN9bkwtEu4I8Pf1FAnum7CeV+iBe9DP8yqI2LD8CFX4ca9df30+ CuoYIdZuf/SLUslFT2YFkyCxRQ1+5SsFanaFiPGwg1iRp77lEkQ7xJlyhi7NrgFrBiW8J7 zMikQ5gCs2Cyu+6kiXkofqErTyMzsTLOr32lyxgvs/47JkGvGhv+7M6YyFKgUbb4zi+5Nu gzqsZ1IDXI/RbpMt21lgxf7g49UDwSpva7Lh4fAodl/BWxIGDXH7HXrp+g4IpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637689691; a=rsa-sha256; cv=none; b=gfF4tS4UOZRaBd68K/6zU0fKO6CHrp0hSBJ9XJsLZTDOHMmfgBvrwmhC0hwBRAchyiVzSZ 24P8tDRZdD5b9z/7PlzqUYjzWAp12ZL/wuHXWkBpKNLyxgzcMXgnxmgFJBnSuyZQMTPdOX tg15lMhLh8stP7WNlHXaS0ibA7DWmpAwVTgCjlF+FESzfsw3fMhWnYJUTW83pI+ILmx32B S4Pm1MCmOBtHQkUg8Z9vOhOJduO/raxTq36XbGtLDte7hKTZzbDT9eWyvLZclthJQYmUDw veRm0mln1ZBfMA461arHVIypGlFPE9u5CY/uZGBk9yGP1xppFtYFfkUVzgKOPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c36f90417b734e56ef938cc2d19601001c709f40 commit c36f90417b734e56ef938cc2d19601001c709f40 Author: Kristof Provost AuthorDate: 2021-11-22 19:30:22 +0000 Commit: Kristof Provost 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)) {