From nobody Fri Dec 17 20:44:49 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 4E8D718E6A4C; Fri, 17 Dec 2021 20:44:55 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JG1FM06nhz3hSv; Fri, 17 Dec 2021 20:44:55 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id C08F19873; Fri, 17 Dec 2021 20:44:54 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id AAEB02815F; Fri, 17 Dec 2021 21:44:52 +0100 (CET) From: Kristof Provost To: John Baldwin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: dc04fa802dc1 - main - pf: make if_pflog.h self-contained Date: Fri, 17 Dec 2021 21:44:49 +0100 X-Mailer: MailMate (1.14r5852) Message-ID: <44425AE8-B4F7-4941-9F20-79998426C4A5@FreeBSD.org> In-Reply-To: <9aefa94c-e0e7-c5a5-2aa6-6b427581dae1@FreeBSD.org> References: <202112171139.1BHBd2jw073888@gitrepo.freebsd.org> <9aefa94c-e0e7-c5a5-2aa6-6b427581dae1@FreeBSD.org> 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: quoted-printable ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639773895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vjRX/o9bR2VqDYaQYCJR6koYnj+ZW4cg8Pa4yWsQwvg=; b=jcvUrrVUip4rFpAmJcxI38y38Eohe8TsZMb7By/Fyx68hPjOlJ6U5mwBBqy8ls6+wjJsqS ntwJW729R1bzsHif1tbOTYTgdxxtes5Wqu9Xs59TKsPraUnQkSsvhvklF70DFJuN/WBAhX hy1bRtkb76NHoevQmrDOXy1LbFZbQT+DeTpQGjB2Wv1Mpzf1+Q0WvcKbR2EzKsTkMLdp22 1fUmh6m+a+FTAOkbY3yh5lXZ71ftBSPJMKFnT7tpIUOLKXBgOJ7RQtMDDCOUwWHut2fFAY sXcq7yVlKjnsmA/LXbgrxOi8uhq5mA/EJzhc7j9Ai9B29/RlHucIC2udOazTWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639773895; a=rsa-sha256; cv=none; b=yeC4k78umy1jMhbB38OBHbJSw3Fiz4iLwJcLCOy4Hi8d3wfwSQFD1xEI8gYr3xMDVfgppP cd0NlcXjkA2cVw+ukPAJtqlSb76CNoTZLg6o+Eaj8deRwDIBkukdnZGzDBlNnBU8iJZoLQ 8gAttCTTBm6/wGaCPDqAocYIOZ6wg8fkW3JRPy4d69gUXVyeVPraL9U5P2020RaKPFll/s 9dVjgSBlb/1eg1zIRIbWu6M18ruhEWAtq2Cu1mjwDS0LgaHNP39xScb65CJqTyk3F0qQHW NmcstW86Rg8pTqOavzhChNWARswrVb826baynd0XAzyYljfI/nEwwRY2Qk3Thg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 17 Dec 2021, at 21:01, John Baldwin wrote: > On 12/17/21 3:39 AM, Kristof Provost wrote: >> The branch main has been updated by kp: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Ddc04fa802dc17ec663dffb3= de99db2690b393ca1 >> >> commit dc04fa802dc17ec663dffb3de99db2690b393ca1 >> Author: Kristof Provost >> AuthorDate: 2021-12-15 19:54:19 +0000 >> Commit: Kristof Provost >> CommitDate: 2021-12-17 11:38:35 +0000 >> >> pf: make if_pflog.h self-contained >> Reviewed by: imp >> Sponsored by: Rubicon Communications, LLC ("Netgate") >> Differential Revision: https://reviews.freebsd.org/D33503 >> --- >> sys/net/if_pflog.h | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h >> index 93a69a2bb3a5..0406f78474a8 100644 >> --- a/sys/net/if_pflog.h >> +++ b/sys/net/if_pflog.h >> @@ -31,7 +31,10 @@ >> #ifndef _NET_IF_PFLOG_H_ >> #define _NET_IF_PFLOG_H_ >> +#include >> + >> #include >> +#include >> #define PFLOGIFS_MAX 16 > > FYI, as a counter point, net/libcap doesn't build on main (thus meaning= that > qemu doesn't build on head) because it includes this header which by th= e nested > include of adds duplicate definitions of 'struct bpf*': > > https://lists.freebsd.org/archives/freebsd-pkg-fallout/2021-December/15= 6851.html > > (It only started at the start of December, not sure why though, all I k= now is > I can't build qemu in poudriere on my laptop anymore.) > Yes, that=E2=80=99s as a result of the addition of the net/bpf.h header i= n if_pflog.h. The include situation in libpcap is a bit =E2=80=A6 complex let=E2=80=99s= say, but I=E2=80=99ve already submitted a fix to that project: https://g= ithub.com/the-tcpdump-group/libpcap/pull/1074 Best regards, Kristof