From nobody Tue Dec 07 15:39:18 2021 X-Original-To: dev-commits-src-branches@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 4F0A618C37B7; Tue, 7 Dec 2021 15:39:19 +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 4J7kxL6t8Qz3jq3; Tue, 7 Dec 2021 15:39:18 +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 CD81522334; Tue, 7 Dec 2021 15:39:18 +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 1B7FdIfL034255; Tue, 7 Dec 2021 15:39:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B7FdIh6034254; Tue, 7 Dec 2021 15:39:18 GMT (envelope-from git) Date: Tue, 7 Dec 2021 15:39:18 GMT Message-Id: <202112071539.1B7FdIh6034254@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: 22d368ca46eb - stable/12 - pf: remove unused variables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 22d368ca46ebff4d75a7ddf0af2f115084f3939c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638891559; 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=dJ6miP+7v5Tjt9GLOiFIxxYBC2wv1ot6Wu5gT0zQQ04=; b=Q8BQzLZHZvKrPDu02Ao+p3WzJwgukJrMfc+K+ih/Sex85sNN9IkTsoDjIj0KYlYg3ourSZ a9qbhBJxgAqmFzp39QduhW13neqtekguIwrS2xzSq3ejYwOp7DcDoodsipP0WP3KJu3HA3 1oDXTTxmWgnRbp1Q5CNci4VyW5nk+HVXkI8JpL9YgUR0GukrUuohOdPDOP0DNTYhDKNXfH aIfq0EkH8E1nsh7BfzTkd+WJNvocXf9Wm1sdlGJrdk1ty9atgTLBHY6flDs5IUH8E0WZ8T NrpxPg8tIogtBo379vkG6jhdYPU2H1MXJADg2t7tOfQyD7cWORehA8gQTub95w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638891559; a=rsa-sha256; cv=none; b=TJ/GxNZgxrPq7KygPmdxRGZJ2uoKGAPFTnIOO7N8TzBTrnHDlx6S0QCzo5oaYflXd9bU6d +yIqPRyYNZLAYQj/5bWexQv9HvlV8puVmrnMrCg/6Mp2xs2LC7KY/9HGi4lZ3uBnrpXhmD 96+5+YYJO1vbJCFRDWAogLEZ2Pe8+v62TsQ2CHkdUt+TGthYSo0OmI+1eSlWk4KxtU2rjA mNc7qvL6i7OuR+gixsbyac5fHTAlNRUu4cxI1NZFzN8gx47rco7YJEDpWKU4UGiMir6mAH BHl+x6WtQdO+6M3y5Am7CXHIejTxDNoD+7DGlW+TrLjXt1DoPZz99AefgvYqyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=22d368ca46ebff4d75a7ddf0af2f115084f3939c commit 22d368ca46ebff4d75a7ddf0af2f115084f3939c Author: Kristof Provost AuthorDate: 2021-11-22 19:30:22 +0000 Commit: Kristof Provost 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)) {