From nobody Mon Jul 7 10:07:04 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 4bbKfK1ntjz61Jjl; Mon, 07 Jul 2025 10:07:05 +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 4bbKfJ6wL2z3dy5; Mon, 07 Jul 2025 10:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882825; 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=IWjVC8uUPZHqg0dUYB1zXwncw4DXM9vvtVVTX38SO7U=; b=wUJAzXXdX7opqHJbyGlgPL5BFSRCEOoFPDjCQaHlYKTrZJ9K0jEm39e105ph6hZ36b4S33 3bSdXY5yLarRsiwNbkpZHfR54n0Wz5xZbtS+0h72S6pcySPk8kJexaZGPxj0hJXqC20JLp Rzb2doC7X+BjcoCzpG8FVpSG/7pHOl9svtLEAkUWVOiHYT2j4JuRcdsbUVQyp4twP42OzV d+7z6kS0LTZ6sK6nyeLkJIlW+t1GV9Q8I/anVDSfUq1MkxsTHTDt1HgofcLLq+JRVYu2uy RINYKeVWoZhM+rL4RiSdysP6B9SwxaEy4nNYyn5NvgwsJXQVtSVveAErBLHS5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882825; 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=IWjVC8uUPZHqg0dUYB1zXwncw4DXM9vvtVVTX38SO7U=; b=NI7ByPpg8TFz4yOFf5N+Z0KlVQsIGyWC5/rmf6mrhIDGbXA/rocJ8mm14obpzrP8xhg+5W vpXX7zy2VCjPbk5qfAuWACtqbK/nGKjUWch77WBgzzmIZ98De5w/DB2/XovyMt/5Ibp3Iq cffD+qybTXCr5Aw7LqW8g7WeCqG9/yPQCB4kunghvRN+4Fm7y3b1aMBgzI3K1RMVpZE3M2 BKNty6v+g8JBDhUq4Ln7oLMg7YVtkCXtKykDvjoKRgl9ar8l8yZqgkl0tmfNVdJLSbXm1S 28DGbLtoRVD9+qfrME6DdUBY8oZSfRe23Ehy8nsmrwWhPnv1k1MUo8fgw9Z6JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882825; a=rsa-sha256; cv=none; b=ihVLgiBZlFI5dVgpsXwBsmjKI27/yhv/WEANRPASNYtzN+S/MB69DEd8Ff472wrD1wO2Jw Qf+tKyfqTBDzoBrtnMsNaI3Y14mspTOoZbOSxJKTPnxqmnYyel5mKrfYY9rcxa7cMxbyHO JE1/S6id2wOQmYRwFKM+EfESWHe53nlRoqj9Gl95lbNe8EIH/bngtfRqSpRJHIqghtUNky /u6EM3DvS7HSJWG7/oRyA25ePDDCSJyw7yF/Rh7YD71mLhSZsifWpFSECNWVX2l6fAm5gm D0ogbgFIDPudr5CWUvJqp3IBhoFKaa+5YjJ1708sKDwd305VLaw7VOiXeJcjzQ== 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 4bbKfJ6XDyzmvD; Mon, 07 Jul 2025 10:07:04 +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 567A745j053633; Mon, 7 Jul 2025 10:07:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A74Sg053630; Mon, 7 Jul 2025 10:07:04 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:04 GMT Message-Id: <202507071007.567A74Sg053630@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: ff54b680383b - stable/14 - if_vlan: Fix up if_type before attaching the interface 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: ff54b680383bb0f212e813b74e7a3f76423d2238 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ff54b680383bb0f212e813b74e7a3f76423d2238 commit ff54b680383bb0f212e813b74e7a3f76423d2238 Author: Zhenlei Huang AuthorDate: 2025-06-26 16:37:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 if_vlan: Fix up if_type before attaching the interface ether_ifattach() does not touch if_type, so it is not mandatory to fix the if_type after ether_ifattach(). Without this change, the event listeners, e.g. netlink, will see wrong interface type IFT_ETHER rather than the correct one IFT_L2VLAN. There is also a potential race that other threads see inconsistent interface type, i.e. initially IFT_ETHER and eventually IFT_L2VLAN. As a nice effect, this change eliminates the memory allocation for if_hw_addr, as vlan(4) interfaces do not support setting or retrieving the hardware MAC address yet [1]. [1] ddae57504b79 Persistently store NIC's hardware MAC address, and add a way to retrive it MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50914 (cherry picked from commit a19b353d354d4ef808965c53253103cb6e7e6708) --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index dce1cff5bc69..6a0d9331324e 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1185,10 +1185,10 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, ifp->if_ratelimit_query = vlan_ratelimit_query; #endif ifp->if_flags = VLAN_IFFLAGS; + ifp->if_type = IFT_L2VLAN; ether_ifattach(ifp, eaddr); /* Now undo some of the damage... */ ifp->if_baudrate = 0; - ifp->if_type = IFT_L2VLAN; ifp->if_hdrlen = ETHER_VLAN_ENCAP_LEN; ifa = ifp->if_addr; sdl = (struct sockaddr_dl *)ifa->ifa_addr;