From nobody Fri May 05 12:11:08 2023 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 4QCTzw4zvyz49Ffg; Fri, 5 May 2023 12:11:08 +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 4QCTzw4MRBz3GFQ; Fri, 5 May 2023 12:11:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683288668; 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=/xZNUUB3FaqLJztAa4rBxQNHYQUSpq/sbPjj16OLe7k=; b=Oopj4sdQ3vOCMsfDuzSwW4S3/TLWpWISq0zRqIcj9DJAuM78yO4RMJIyX1zP6VhImMz2vX UGY7Wm46Q5wXNcPyVlPpmp205nG2Xig30fmqHeWxwty8UxD3Nev1mTq9lkrN4Lg1tMY/OH TOAyHb3wSgoSKXwR2ftnEkMZsaZ2NshKh1kB2eIjhz4b4iJDtEXwOJfN3/u+lFAsZ2AvRT UlCvGq6Brjurqt+kYZ30RQg06rxUt+1X99d/RDa3WAT5IrEH4xta6o0UE43H/dw3ONxoSY Z7Zyi3KjrxzjLcaE1HgkZalVrMNr7DoJR3rG7YuVujHmpFNfVIIr7xG/wbE2+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683288668; 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=/xZNUUB3FaqLJztAa4rBxQNHYQUSpq/sbPjj16OLe7k=; b=FugDTbKzxkZcNAY+edNr9AGmB7dJslbNdgpl82dbQa8R6qUhw2nG7cG65AL3H2+tDTpvXA OjXuZYIYMvVh6Tm9WecMcO3zqnZXMDc+RLtT7wuxjscekkWM4TKEQdYHwxWP8GhZUXyBAa KgJ2hdMvwWdaadB4eWp8jzdYCShOeWVueGtsCYkQ+v8D+i9M45glq2jL7Ig9rCOxcD6uZm iV7ucIO+XqlT+vmLaplZ78jmLjVGtlTOuEOmmp3M5GQJE/JKwRe72Dk+vU9XAYRxeAklZz iGfcu5shBU6KqPpFvFsqefJY78UvqtBrSadrWMj4Sr7dNGEi0KKxK3m23RKjUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683288668; a=rsa-sha256; cv=none; b=KBsGYBGAhJey9HPC2G4Jt63X5bVhRteVpvAdvHOYmbJ9VL+55mWCgXgZnIVPPJYRH6G1x7 DynJF6ajNs+ueUtkjqEbnCm5jJ9XkWAcwQK+FpWBNpJuIPDNWmSfD2cysrXFvWEA4nMQLL hFOTpMRjqxkEvdtDnN2UqUt77NbQmuh4vXY8e2rIvuBmQMkX6xc1tWuBuYXrZgQDjIhsLm TKhE0QbmkS/aa1Lcb+5++Te6ZJqrwKUkzZy+aRFYg+8g9Rq8OZOSboCDn43oG8EjeDt0+H pwIxK6llSxWzTPohK1yAN3M3Uo4WA1y+wZtqoQUEXmPi0PI4It6A2eUmdnsTkg== 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 4QCTzw3BJ2zth7; Fri, 5 May 2023 12:11:08 +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 345CB8Wd091340; Fri, 5 May 2023 12:11:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 345CB82I091339; Fri, 5 May 2023 12:11:08 GMT (envelope-from git) Date: Fri, 5 May 2023 12:11:08 GMT Message-Id: <202305051211.345CB82I091339@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: 8216f1a9ccaf - main - pf: fix a few more prototypes 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: 8216f1a9ccaf880ac9cdb6d973032239d64e81bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=8216f1a9ccaf880ac9cdb6d973032239d64e81bf commit 8216f1a9ccaf880ac9cdb6d973032239d64e81bf Author: Kristof Provost AuthorDate: 2023-05-05 11:40:25 +0000 Commit: Kristof Provost CommitDate: 2023-05-05 11:41:02 +0000 pf: fix a few more prototypes Fix function prototypes to use the same type for sa_family_t as the definition. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/pfvar.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index f72c3980438d..b9b7640788d1 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -2166,7 +2166,7 @@ VNET_DECLARE(struct ifnet *, sync_ifp); VNET_DECLARE(struct pf_krule, pf_default_rule); #define V_pf_default_rule VNET(pf_default_rule) extern void pf_addrcpy(struct pf_addr *, struct pf_addr *, - u_int8_t); + sa_family_t); void pf_free_rule(struct pf_krule *); int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *); @@ -2181,7 +2181,7 @@ int pf_test6(int, int, struct ifnet *, struct mbuf **, struct inpcb *); int pf_normalize_ip6(struct mbuf **, int, struct pfi_kkif *, u_short *, struct pf_pdesc *); void pf_poolmask(struct pf_addr *, struct pf_addr*, - struct pf_addr *, struct pf_addr *, u_int8_t); + struct pf_addr *, struct pf_addr *, sa_family_t); void pf_addr_inc(struct pf_addr *, sa_family_t); int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *, bool); #endif /* INET6 */ @@ -2386,7 +2386,7 @@ int pf_osfp_get(struct pf_osfp_ioctl *); int pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t); #ifdef _KERNEL -void pf_print_host(struct pf_addr *, u_int16_t, u_int8_t); +void pf_print_host(struct pf_addr *, u_int16_t, sa_family_t); void pf_step_into_anchor(struct pf_kanchor_stackframe *, int *, struct pf_kruleset **, int, struct pf_krule **,