From nobody Thu May 29 12:47:37 2025 X-Original-To: dev-commits-src-main@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 4b7R3Z0TQMz5wym8; Thu, 29 May 2025 12:47:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7R3Y6F2Tz3QBK; Thu, 29 May 2025 12:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748522857; 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=TW1n9FZ6FuLRhgOKemxOKksZjKRNUE7butFkCDeFIUY=; b=gyZ1VgLgrHcEBh2jIrOepaYP2YxM92HL51XlMtfEb+YDjLec4720jvzpJAuVqPwWIx0P+z 53YkXdH4W1Wd41BmThe59qwPXplIKS30uieHXE4iooKYb/dK062u3u8FUIt7+Mt/Ws/h8Y QYKlSfPEUtSIToyrUZ+4tzsXb3aBWOvwDLdzO7iYjoZD77Qydwei8ZKpApNlYrSyICTFVO wNycaB3XQJpWeHbfs6Q7/35dpGlLWs0hcu+ZtByWtnXZhoEI0WPwxE4iu+HqqNnwvKf8zC A5LKkMiBgBXem1zMp2xIZcWym/m6kxT6ZjMcqnyOwnJVX9XkKH0XhNxtpAsSNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748522857; a=rsa-sha256; cv=none; b=n9hS8CogV7k1szryem+mYKwdFKH8Mkbx3c0x2SxK9vvfnK1IPyOpRc5XJRnIeLYE02nozQ WR4/8Lv0Hk2NS8jidOSs18T6yxd6L/uzM6SljmKlNLgmwZifmkWRfnd3SwUk8qt4w0AQhx mdaIpjxsZAgUx6ZEji7vEZIeN+OuaxSNOsUXpNXOda68DdgBI/jHa4enC4rIiwU51TKDmZ vzlwIcaZOy3Q40uyf8qmNO8XSQ4qVbwFOqtQK3myZtQgyLhaxgYYuwwb6QrBn+hu73ykjM Y6dYZz0hH8ht487Qaxyqw6c1irhJJSQ/UlrGF5eDetsEb+zcf9+C4UwpxV2+aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748522857; 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=TW1n9FZ6FuLRhgOKemxOKksZjKRNUE7butFkCDeFIUY=; b=vBO+NVUfC879/dpeluprZvCy0hAKztrZ5rxV1ZRKYoBpSdcjWERDe21tLmqTA57Wak6/Qa xzhCMO6P9zzs9GkGVBxvGk07ligL+uz3/j6JwjHrx66+8siNOdZG0T//eNB7huOZLpKV+6 X/oXbhhgX2PRDmmIMypvyyEpPwjhzpo7iQ1RYulukl8nkWQ5qWfvSoINMUcyRbLCS0NF78 t6jC+EpByTyJ82HTAFYwueAavhnNnLCB/Qc3QHpQkVM/a5Msuk+//bh/dM0TcG3lXpDRD9 nLkAaN8TnIc/mkp4N1tVx+s98s6QC2dpqZamCGTL3s4itV0CZvp0lT+2DEvB1A== 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 4b7R3Y52yqz1M85; Thu, 29 May 2025 12:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54TClbPb023406; Thu, 29 May 2025 12:47:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TClb5P023403; Thu, 29 May 2025 12:47:37 GMT (envelope-from git) Date: Thu, 29 May 2025 12:47:37 GMT Message-Id: <202505291247.54TClb5P023403@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: 7f81f87a74a4 - main - pf: remove unused 'dir' argument in pf_reassemble() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7f81f87a74a413f7c1a42ba9a48dd21603fa94e1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7f81f87a74a413f7c1a42ba9a48dd21603fa94e1 commit 7f81f87a74a413f7c1a42ba9a48dd21603fa94e1 Author: Kristof Provost AuthorDate: 2025-05-29 11:24:46 +0000 Commit: Kristof Provost CommitDate: 2025-05-29 11:54:55 +0000 pf: remove unused 'dir' argument in pf_reassemble() pf_reassemble() only uses it to pass to pf_ip2key(), which also does not use it. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf_norm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 8157ea556591..ed9aed157993 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -147,7 +147,7 @@ static struct pf_fragment *pf_fillup_fragment(struct pf_fragment_cmp *, struct pf_frent *, u_short *); static struct mbuf *pf_join_fragment(struct pf_fragment *); #ifdef INET -static int pf_reassemble(struct mbuf **, int, u_short *); +static int pf_reassemble(struct mbuf **, u_short *); #endif /* INET */ #ifdef INET6 static int pf_reassemble6(struct mbuf **, @@ -163,7 +163,7 @@ static int pf_reassemble6(struct mbuf **, #ifdef INET static void -pf_ip2key(struct ip *ip, int dir, struct pf_fragment_cmp *key) +pf_ip2key(struct ip *ip, struct pf_fragment_cmp *key) { key->frc_src.v4 = ip->ip_src; @@ -735,7 +735,7 @@ pf_join_fragment(struct pf_fragment *frag) #ifdef INET static int -pf_reassemble(struct mbuf **m0, int dir, u_short *reason) +pf_reassemble(struct mbuf **m0, u_short *reason) { struct mbuf *m = *m0; struct ip *ip = mtod(m, struct ip *); @@ -759,7 +759,7 @@ pf_reassemble(struct mbuf **m0, int dir, u_short *reason) frent->fe_off = (ntohs(ip->ip_off) & IP_OFFMASK) << 3; frent->fe_mff = ntohs(ip->ip_off) & IP_MF; - pf_ip2key(ip, dir, &key); + pf_ip2key(ip, &key); if ((frag = pf_fillup_fragment(&key, frent, reason)) == NULL) return (PF_DROP); @@ -1200,7 +1200,7 @@ pf_normalize_ip(u_short *reason, struct pf_pdesc *pd) * Might return a completely reassembled mbuf, or NULL */ PF_FRAG_LOCK(); DPFPRINTF(("reass frag %d @ %d-%d\n", h->ip_id, fragoff, max)); - verdict = pf_reassemble(&pd->m, pd->dir, reason); + verdict = pf_reassemble(&pd->m, reason); PF_FRAG_UNLOCK(); if (verdict != PF_PASS)