From nobody Tue Dec 7 15:39:17 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 5073D18C3651; Tue, 7 Dec 2021 15:39:18 +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 4J7kxK70WWz3jsZ; Tue, 7 Dec 2021 15:39:17 +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 D017222492; Tue, 7 Dec 2021 15:39:17 +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 1B7FdHcw034175; Tue, 7 Dec 2021 15:39:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B7FdHvb034174; Tue, 7 Dec 2021 15:39:17 GMT (envelope-from git) Date: Tue, 7 Dec 2021 15:39:17 GMT Message-Id: <202112071539.1B7FdHvb034174@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: 3d11fa82c812 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3d11fa82c812060594152ed2e9e397e5d5fa838f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638891558; 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=dXNW/+XYl57M4QWTE08493Zg+6ikHOX0+f36pmzj0WU=; b=JjmVzcf0rxPJKMTlnAsPulM8Xy8XjFt/vste4bhgensmDGuJzMzhv+kuS08Mbh4j1iJyHP xLdEkxFlHp0gZN0qOy9POTgfENtBGKkaypDzLx4FdZm2wCuORafJXw/4aXVUMu2vqlGO+M Q80DdhqnuMtA5f9176VpVmQTyo20HLE8YtKMrNWB+2NzTnXrgk4GACukInnxqHhKyIjFMr 1iu3bI5a5jHNBTBoFoBcieT88ZXTcqpKYP5im84GD33Yr8u8u/rROAbL40HZ1lKZ9uHJzE bl/EXmdQHkSeRAPNX/Es42qo2Jk6ckEjU89f/zoFrthrSVj3poLktgQ48bfd7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638891558; a=rsa-sha256; cv=none; b=AiNnr9cyoiguNuPLd8uKZ1kgLxMDIwRF9EV3Pe2DZQcAc5/5oVKW7lYxa3+n7QsIju7O78 sO4fEAJ9LLU8zq0L2y7+gjJWAZO54HD8Yr+6krRKagWuODIYSS8x8JvZNuy8mWKT9sxr8S 9ERsgiDMQbHApZmyFkrq3jjRpE4jbHzaaP2T5qCth31sTz2ryz5yuc+1P9OXmg/TRG2sGo SCCvGdrkPYUGlaq/nG91K9ZB5yjySCajDFuwC+HyRdpx8/uRxFYffUpSHUQU0Lzw1btHN5 PeWGnJnOpWp2LJcjAKzksujr5GOGOLRydo9wZOOw4npF8DVH9+X4n5oZYfx40g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d11fa82c812060594152ed2e9e397e5d5fa838f commit 3d11fa82c812060594152ed2e9e397e5d5fa838f Author: Kristof Provost AuthorDate: 2021-11-22 19:30:22 +0000 Commit: Kristof Provost CommitDate: 2021-12-07 08:05:06 +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 1e6911c16f73..3f7370e1cf12 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4922,7 +4922,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; @@ -4949,8 +4948,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 e9674d21ec5a..56b30faf7e52 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)) {