From nobody Tue Sep 2 14:52:14 2025 X-Original-To: dev-commits-src-branches@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 4cGTHK55Gsz66r2r; Tue, 02 Sep 2025 14:52:29 +0000 (UTC) (envelope-from zlei@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 4cGTHK4SDdz3pVX; Tue, 02 Sep 2025 14:52:29 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756824749; 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=tYWb9KAXd48FPYJu4JeTopsHH+jL89xhlDVBLk0zRxM=; b=K6T7iZ0+h2joUTH8NWhKdK3kr+IAbJzONJ2HZUiHxq/R/MAaZBbSf+zddu0kkFd46MQVRv vUv3lUnqieKy7oKQ8DGWmxYoVk6gAD3R+yhHIHN/u6Ykl6nrHOH6aUp4Y9+iVDVZl2tPW5 mE6umbdVYI5yqfmTWExU8Xq+foANcx1nveGpPQQI/FBEqG+NQUOdCJ1+Z1AFgA+epwkq/A 2V9XmUiKQIWuFUnhQUxCWv42ycezh4JJSHH+L6AUshxeqytCivnBMEM4PNFT7x/m4Q1t1M H2ranw9mPgYvXbl2z0yoO8LnJjzcDzcC1yQ1bWyFoH0z+lPh1/mFsrz7HTzovA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756824749; 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=tYWb9KAXd48FPYJu4JeTopsHH+jL89xhlDVBLk0zRxM=; b=SbZ93CqnwZ6NrLO68kSznONSH+uDkolkp4IYUbBveNVlgnAEt7ek2vpmSqpNrweKG8MZsC KRbsrl0p2vJsRJTZocr/FK153MgRqwmi7J6VJSQFRJEqdCIXxUl+ZqhWWnmFEqETLxbOMz AAe8fH0/pf+9alE2JwxaiN3Qp01sw5+WF2SMZkaajsEXnlR9PMa2QWAUQ68rgl/39MHXwY 7ARbp9OvCoSAowZyqaUkRv4n1KW7UOepnOFj/+1e7YpDw/LdV9sbL+pITrDCETuUouHnwc 5nC2oeWe6FHur+vBbkhbtPtPOoYzV3mzAiZN42Re7P4TYaYOG45qVrBBpAucng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756824749; a=rsa-sha256; cv=none; b=WhGghJ1UsSVewl7sjdMKn6F9dyh7HfVo0XKUQAnl+nlpA0m9JnLHB60G3Y/q2w2IjozOqZ zXM2ZSBdnz2Y4MT0oUqCWFln4hO66ghKVvMurBQW+x/34EcrgwRaIgbgmn4zznbSEMHcUh LMaCfSKMo4lus9npr7rd+GG4IZPyxbOsAFVoQxpx1qJXEmQvSR3KY8UUks9naMA8cs7Erj 4ZOWNiyodw2Tlwv92soCO2wqgyUF5vGnVSvP/rWjsEUn/RblaH58uX/i90RIpnhpwH92Il 9XeBi2D0kfmFQ+yX5cCetkk57FEsbnfXIJYvqEXvQnLdsb5EBwD7WGYh1kXQ9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cGTHF6YkfzPDf; Tue, 02 Sep 2025 14:52:25 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 135478abe3bc - stable/14 - ifnet: Don't include ethernet.h twice From: Zhenlei Huang In-Reply-To: <202509011336.581Dah0q051386@gitrepo.freebsd.org> Date: Tue, 2 Sep 2025 22:52:14 +0800 Cc: Justin Hibbits Content-Transfer-Encoding: quoted-printable Message-Id: <1D876234-4AC4-4AD0-9ED1-CECC9BEE8DB7@FreeBSD.org> References: <202509011336.581Dah0q051386@gitrepo.freebsd.org> To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" X-Mailer: Apple Mail (2.3696.120.41.1.10) 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: >=20 > The branch stable/14 has been updated by zlei: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D135478abe3bcac1c5195b7e4d75e9f2d= 6ab40221 >=20 > commit 135478abe3bcac1c5195b7e4d75e9f2d6ab40221 > Author: Zhenlei Huang > AuthorDate: 2025-08-28 04:29:06 +0000 > Commit: Zhenlei Huang > CommitDate: 2025-09-01 13:29:42 +0000 >=20 > ifnet: Don't include ethernet.h twice >=20 > MFC after: 3 days >=20 > (cherry picked from commit = 393356f25fb8b76e38b10347f0ad40d4a23372ba) > --- > sys/net/if.c | 1 - > 1 file changed, 1 deletion(-) >=20 > 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 >=20 > #include > -#include > #include > #include > #include