From nobody Thu Oct 29 06:09:14 2026 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 4jFYhp6fg3z6xrmZ for ; Thu, 29 Oct 2026 06:09:14 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jFYhp5Qpvz5441 for ; Thu, 29 Oct 2026 06:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793254154; 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=JyrS73rsdxpcKzQu4AKec9DAqp25udEVvH8DsfYoKQk=; b=Iz18mFKsIVskc+i9VKKySPdiLvmab9u+JjkzADo1urEYj69jJd5dgqHAZj6cneoUHQMfjj Mepqu5GU4J6f9MkHfe06gSxuIumWXoki6ZjWMHb6ODAvTQ9pdhiSlq7UePiOK8XYori+36 biI1HheIKb4AlFcaMGCkm3nCgSeIu3g9/mZGlMoZcqf7mu+HSCs2Kw3NeHhiFqUXpa+bLh VH9YMK2xtAprPliM+a0z231RwhR/woGFiSSyWG1DSq+6VZA+2lWIiVLOgq9F8cC+mpN3sc E3ecuHzLwiMh7//5E5Xsk7pfdoQG/Ok9eYgXZ6CvsiXecXIECyVbPo0RJouyCQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793254154; b=XG9tqZKQvaNCZxWUvu1/SngVfrKX3HTGk1iXW382G5rUrUSG/o6UzUjTR0SpTrwmPIhWWQ outUI1E0q3UyKTc8AwaIZoppWYfvVU9akzv8miTEhqMztwtwWPqRaIQKpZ6fkre6IaDdCq ZrEcI768bNW8OuZnen1q5t5eIfFaqFNSzm7ulwMuXIDRrogmzN4UKsSgrypz1VNmW3O4yu tOYxqMFx2EKWyK37GjBcSRY3lhKEXF2orzvDnhukA/isnrXmjwS6kQ/IhMr7b2cEnmwGSy Qk8zyHOvEO5rXs2O0u+PpRx1xdEfISsEYI/WObp0BVEgkbCU+HizQYT29ywbtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793254154; 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=JyrS73rsdxpcKzQu4AKec9DAqp25udEVvH8DsfYoKQk=; b=OF+lzzQae5G/Ythz1BH3e1Rq29irikXclDSIYcVy4OkfSouC5nIfr/oLjvUzK0TZ9ua39E Q6mQsRIRH3ANQZTjOsUiUg/4hY1pRckIeMGhN7z/UPRaXnNHNx4MsI1PSj7HuxCI0NW6gw tC6fl6Fg5konSksJHyS0Frt8xyGXdNDmOjY77flzWRPZCca8fM77Yr56Hy5ajX5U8BCP0v GjR2htUAKgGxZaWdwpcjNuq8W5vCSv7Qi6JtzTswb6cR2Si5VVUOEIcUbgF0VDA/dSQ+I4 UFbD+bJgbIGntYPIRLTbm8WpzG4ed3x+4HCkraJDywbT25rAdkLzQiOrK/HkLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jFYhp55X6zQt4 for ; Thu, 29 Oct 2026 06:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a594 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Oct 2026 06:09:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a2b4b71ce33a - stable/15 - vlan: Notify the parent when replacing a VLAN ID List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a2b4b71ce33a9308d9444c92e29b397ebab20cf1 Auto-Submitted: auto-generated Date: Thu, 29 Oct 2026 06:09:14 +0000 Message-Id: <6ae2e30a.3a594.1f59e139@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a2b4b71ce33a9308d9444c92e29b397ebab20cf1 commit a2b4b71ce33a9308d9444c92e29b397ebab20cf1 Author: Kevin Bowling AuthorDate: 2026-09-16 17:13:01 +0000 Commit: Kevin Bowling CommitDate: 2026-10-29 06:09:06 +0000 vlan: Notify the parent when replacing a VLAN ID Changing the VID of an existing VLAN interface rehashes the interface and announces the new VID, but does not unregister the old VID. Parent drivers and VLAN event consumers can consequently retain stale filter membership. After successfully inserting the new VID, emit vlan_unconfig for the old VID before the existing vlan_config notification. Do not unregister anything if insertion fails and the old VID is restored. Sponsored by: BBOX.io (cherry picked from commit 50b3763bab6295ac40f6e6a6562bd2d92a1d0768) --- sys/net/if_vlan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 5f03beac0b76..a5161c7f0f92 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1706,6 +1706,8 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, uint16_t vid, /* Re-insert back where we found it. */ ret = vlan_inshash(trunk, ifv); MPASS(ret == 0); + } else { + EVENTHANDLER_INVOKE(vlan_unconfig, p, oldvid); } } /* Will unlock */