From nobody Wed Sep 16 19:51:08 2026 X-Original-To: dev-commits-src-main@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 4hlTz56bNDz6sDxJ for ; Wed, 16 Sep 2026 19:51:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hlTz566Tbz4ZMT for ; Wed, 16 Sep 2026 19:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789588273; 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=Gaq0FGfNp0jbjgeeVfJCu3B+5VumlQVIyR5Y/5ClCK8=; b=O9nLB4kko/s8ojtqjWn6aanpN/mJ5KljhdYA2p1jfhtl5y7qxYZBF7n0O3cI5BtZUafrDo p/st50JYNNdJI5+WqQZz77Vbv0+i0KL0Z+z2oarOJCSF28/PAtTsGvjmbaOwOtzZZQpwIF OiFvl6FK/RJ6WeiBs6qaH1RSTVve3MvOpEK2E1IAvdXU0FE3aCHFG7LD26Uq8jiNC2QyMq slA+dJW7BG2QubpCAA50ZfFgeKH5r6nRepVPXhkLYqXpvAS1ijISHl8RO4eqLduxJBsZE1 RtTP4intlrslX3oTGrqdG4MOb99V6LGi5d6Bo0tuUNs3GdbQ0WnQ9htakTygAw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789588273; b=ltcOLXKtq3ZO+d2naQ4RBxNvSHpmDZs3BM2DXEvdMGSwa1oW1frbjGpmx15xgWM4R/YrQH OP+TBBaGV6LvxSLnHN2UhfEFM4IL3z8R4UgGnU6DwsI8VPFx9oBUZNFZxQ7m+CC53TiW55 Tn6O7C+vc+JhDYfaGLtLruM1dW3eNAZNbOnXKQoapu+B26zAn01IsMnBrVmPN0xzTFvrf7 iFeV8E/JWGyzbU7m2/GXtLvMP9J2JBW3ZWfPjJ+BKmsO115FF0c8RuFL7QXDPvYccTf6xI BigBdl1SyGCRmkAJFRAzua6M0Szik9PdQdykzJcvYfC/nMvE8jmScLN/NJOJ5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789588273; 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=Gaq0FGfNp0jbjgeeVfJCu3B+5VumlQVIyR5Y/5ClCK8=; b=QEBXT6WVeSa8NbYlCedFIfyWdV4nlK303lt1seJ5Ek2hcYZaL+ZRKS8SDiGho0X3VChll5 wQji2X/8WowjdTf6xunbSukZzBmksnMxLQoojQXd9dVIp/2zeG+SDhbRp3r4yNJdIs5PQV +4Rp92w58E6QfTg1SMAhvu/OEMszcaYpEx4zwsSTmaftpo7hk1xQMvmffy6+ppHHIeXhnN DhsLODRSfEICNsASM7/Zx0hcM3DkSodpR9qLShxqseSRYMwi5q/1w/S+tiaCMXglqZ+GPF NSmfz0OToBF/zzLO3GCAFS+qdAqv7MFanYMKdnxFEUJcz+N/faIAy6XNVUg+gw== 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 4hlTz559mDz11pr for ; Wed, 16 Sep 2026 19:51:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c22e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 16 Sep 2026 19:51:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 50b3763bab62 - main - vlan: Notify the parent when replacing a VLAN ID List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 50b3763bab6295ac40f6e6a6562bd2d92a1d0768 Auto-Submitted: auto-generated Date: Wed, 16 Sep 2026 19:51:08 +0000 Message-Id: <6aaaf32c.3c22e.3a5bff8@gitrepo.freebsd.org> The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=50b3763bab6295ac40f6e6a6562bd2d92a1d0768 commit 50b3763bab6295ac40f6e6a6562bd2d92a1d0768 Author: Kevin Bowling AuthorDate: 2026-09-16 17:13:01 +0000 Commit: Kevin Bowling CommitDate: 2026-09-16 19:50:27 +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. MFC after: 2 weeks Sponsored by: BBOX.io --- 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 ab05b4d075c7..959c68a7f32b 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1704,6 +1704,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 */