From nobody Tue Sep 2 15:06:34 2025 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 4cGTbk6ssqz66rnc; Tue, 02 Sep 2025 15:06:42 +0000 (UTC) (envelope-from jhibbits@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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGTbk69Ydz3rly; Tue, 02 Sep 2025 15:06:42 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756825602; 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=Zou9pyr6zWyQ3YH9mWmkTSsve4XHIrqRlGmr4B/4ASY=; b=Kya8Au9vwEjcoySPNShQxRfEzTJuojwj4Li3RM5LarkiOwhzmY/E9R3cqKyhErBGw3NRwD bFQbnlLjoDdBPd0URYzEOP0XvysHc1X15E5+3BM6MYl28DehRQJSOJrrNslf4eo9KCSbQu 21NfJ8dQ9OjzQvYkkGSAlL863/07oceUU8E+ykIh9sUenWvvSb5dSctJrHyMogdzbbP/dk QRmsZxc6mEth58an7niCsVb+QAyt2yjAENDe8bwZZyV9mI0OzsXmWEQ2Ix3YwQFu4BLIux RLmccdSHGjVCJzY0HapHP04SjpiegPQYyGum7HAPH834vl7C9k07EUNJJl5QiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756825602; 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=Zou9pyr6zWyQ3YH9mWmkTSsve4XHIrqRlGmr4B/4ASY=; b=F+8n6fv+2lmoLE38lv6diAPMBehjBki56OqSBZ1WODoL2Gtp5R9JIxTfSaQeJ7cBSZ6/mY T8sNBfdYaBLMaoxDMJ2+AIszED4ruP+KjEMk1yyUhVDh+gloGU4ZBi59YRswxT/gWFy7Ra bFn+SHGLNID16lThLAfDevYd3zaVBkek5FNLXWM8908IQdtR60wKM3+4ulSPFMna/h43e7 3IlgRwHZHEM8Gd8dT03o/oKKp7dbOeb6RiCtmBxfj40su7lOh0ZuMZd/r/kd58lfKnVC95 zLp+c5Q/4mu4wmltNCpmcaEOQz03bG0ePp4JBk3t2bpWhdLJ1RNubeHn0kDKIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756825602; a=rsa-sha256; cv=none; b=pQrrzQVKgTYm6oHhbFSQ5Z/AwF8QmPVPMrJzNpsqQXqHBINr8WzuQcF5Mq70X7ZbrNhp8K KPWgPOjeKNhOKnTjPJsbfBt5Jg00r/seFgZFRe7XoS/fT1iZAzTaPINevgrvPTvTRXk7MA uh5XL/2Bj9BtVWL4A5OOCVc6OPdYHPrGVgthsn7jiQIrXt2KfTQfx2ZYAlp8TvkNd4M2im Jcoe8bK00cvj8EbMcpN0oDUdnILZjlmwqmVwrnkCwEVm/2gfg77daSC5Ue3OV2gA24XW/c 8EPBFt7bJ8lV8xBakCkq9m6kwdIWqdWOF2B+5yGjE0Re6ns5kW5JiL9ChbcppQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ralga.knownspace (unknown [IPv6:2600:2b00:a720:d301:9f03:382a:d672:81f0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhibbits) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cGTbk4C9dzPk1; Tue, 02 Sep 2025 15:06:42 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Date: Tue, 2 Sep 2025 11:06:34 -0400 From: Justin Hibbits To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Subject: Re: git: 135478abe3bc - stable/14 - ifnet: Don't include ethernet.h twice Message-ID: <20250902110634.382a33d2@ralga.knownspace> In-Reply-To: <1D876234-4AC4-4AD0-9ED1-CECC9BEE8DB7@FreeBSD.org> References: <202509011336.581Dah0q051386@gitrepo.freebsd.org> <1D876234-4AC4-4AD0-9ED1-CECC9BEE8DB7@FreeBSD.org> X-Mailer: Claws Mail 4.3.1 (GTK 3.24.49; powerpc64le-unknown-linux-gnu) 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Go for it. No objections from me. If if_etherbpfmtap() and if_bpfmtap() are public APIs, though, we might need to keep them as stubs, since removing them would break the ABI contract. Might be better to MFC 2, and rewrite if_*bpfmtap() as wrappers (aliases) to those instead. - Justin On Tue, 2 Sep 2025 22:52:14 +0800 Zhenlei Huang wrote: > Oops, this breaks LINT-NOIP build. The if_etherbpfmtap() in if.c > requires ETHER_BPF_MTAP which is defined in ethernet.h . > > Hi Justin, > > I'd like to MFC commit [1] rather than reverting this, since the > preferred ones bpf_mtap_if() and ether_bpf_mtap_if() have been in > 14.0 [2]. > > Any objection ? > > 1. 2a3716432d20 IfAPI: Retire if_etherbpfmtap() and if_bpfmtap() > 2. 950cc1f44fbd bpf: Add "_if" tap APIs > > Best regards, > Zhenlei > > > On Sep 1, 2025, at 9:36 PM, Zhenlei Huang wrote: > > > > The branch stable/14 has been updated by zlei: > > > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=135478abe3bcac1c5195b7e4d75e9f2d6ab40221 > > > > commit 135478abe3bcac1c5195b7e4d75e9f2d6ab40221 > > Author: Zhenlei Huang > > AuthorDate: 2025-08-28 04:29:06 +0000 > > Commit: Zhenlei Huang > > CommitDate: 2025-09-01 13:29:42 +0000 > > > > ifnet: Don't include ethernet.h twice > > > > MFC after: 3 days > > > > (cherry picked from commit > > 393356f25fb8b76e38b10347f0ad40d4a23372ba) --- > > sys/net/if.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/sys/net/if.c b/sys/net/if.c > > index 39854489f5f7..07369c4512cf 100644 > > --- a/sys/net/if.c > > +++ b/sys/net/if.c > > @@ -76,7 +76,6 @@ > > #include > > > > #include > > -#include > > #include > > #include > > #include > > >