From nobody Mon Jul 7 10:07:02 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 4bbKfH0RtXz61JSJ; Mon, 07 Jul 2025 10:07:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfG5SrCz3fF3; Mon, 07 Jul 2025 10:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882822; 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=CSA5tbSFeAE1vUtDo+fYejpKnM5UHweaz94am3+GTG8=; b=KEttb2AA75aXJwI5V/10PHSNz44THgXQwuWXoXQX/WXmHvWZ93/iZmuYHDVdWTcCDXimy0 XW0F4lky8kcUMiK1Y2wJkxuu0VkxYu3GmNu5aF04c47qUOJxqqicjLfurXw14OXTCcBoMH 41vj5HKXbjNNSY/3GlKylYJrORxSMNnSmcQYr6P7Stwx/923i5oO/zasWrW362B/2gLYyU rF++sBGbwU10wv/HG5JqDAQBfCdjSVgCiTHrZli6Xzr1u4YqtynUfvGMI1inFoRRlmRgrm 8pD64Xef4uQVXzDZ/XcIUS3wq/EIFsK28fHVS7uhWfFHn/fwHWwHbG1QrOu7gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882822; 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=CSA5tbSFeAE1vUtDo+fYejpKnM5UHweaz94am3+GTG8=; b=onkedMdsnVDHMLr7oVtM6g72ZmXZfwyJxCGA5N7eTCe2ZKXnwBZ6u752gV1ypKtTnIsm5x qunKHxEUr1NppA09kBwtGYcqc/sn6R2axVmcEDoIzO99pWicEQLJHbUETcDbUI5s+6pO9C fbMzUMckO/GvltaIV3ATtHvPdLPSJMpvEi9e3FsZ1uPGJ0u/XGNlVI4AutXEuYKJNuQdB8 B9RoX8SOZMjawyBw82COWkouifcbPyMx5P0Uk+REf0M6NqUDSaO1Yx4ovr9+gvbMC6Ld7S iyKhPV4IFNWaAEHSVUXBTDD4uZQVL3xo+QcGjRgwSCXjAFBniPZnevFxPJqdRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882822; a=rsa-sha256; cv=none; b=rVQfzyRIpW5ZNASJcMDpLEda5TfYUBlJfIeSwqO5O0YTO4iinlLJXZtCWUVBg/HHUmSVy8 l/AdAGByfXGXl2eGn2AXnuYQYYjvz759KKonvmjiTHHaPv/FwV2+YeIAcvjcTOz1KVK1FR 4/vVRwUj7jZrJwsCYjrSytAWJVux54XKe0xEdRf2pBR3O/fF8ud4iBofVeNTxnvMn2TLPt CZjeMyUYDfQ0NT3LHd6ZojJ5XtkNcjjZeZO8Bj76DvA1nrQCjdLU6RoD8MoTqIgae9oXOk DqIL1uzo9gGqDe6TZw5O4DzP1LCKuQ3Nu42dD3M6GZao3C9Zwu+F91Q8U5o8WA== 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 4bbKfG4zqJzmvC; Mon, 07 Jul 2025 10:07:02 +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 567A72rk053564; Mon, 7 Jul 2025 10:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A72Hn053561; Mon, 7 Jul 2025 10:07:02 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:02 GMT Message-Id: <202507071007.567A72Hn053561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3bb09e6b1930 - stable/14 - ethernet: Set maximum Ethernet header length based on the capability IFCAP_VLAN_MTU 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3bb09e6b1930b58d9d92aa3f28515114631a1d6b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3bb09e6b1930b58d9d92aa3f28515114631a1d6b commit 3bb09e6b1930b58d9d92aa3f28515114631a1d6b Author: Zhenlei Huang AuthorDate: 2025-06-21 15:12:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 ethernet: Set maximum Ethernet header length based on the capability IFCAP_VLAN_MTU Lots of Ethernet drivers fix the header length after ether_ifattach(). Well since the net stack can conclude it based on the capability IFCAP_VLAN_MTU, let the net stack do it rather than individual drivers. Reviewed by: markj, glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50846 (cherry picked from commit 6ce8fd1978a9526ff0dc02ed98ef797f9154ec1f) --- sys/net/if_ethersubr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 9210f1378666..baf3a27c2e7e 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -997,7 +997,8 @@ ether_ifattach(struct ifnet *ifp, const u_int8_t *lla) struct sockaddr_dl *sdl; ifp->if_addrlen = ETHER_ADDR_LEN; - ifp->if_hdrlen = ETHER_HDR_LEN; + ifp->if_hdrlen = (ifp->if_capabilities & IFCAP_VLAN_MTU) != 0 ? + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN : ETHER_HDR_LEN; ifp->if_mtu = ETHERMTU; if_attach(ifp); ifp->if_output = ether_output;