From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E5983255222; Mon, 12 May 2025 17:52:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072375; cv=none; b=eaMEV0FXklT6zfz+Vx5/wTkHNb3bXaSXNk9DKBbN4G8xlMlO492Y7TIPwF+Nl6goRaRVwarfyYtJEYP4y8i54C/CHnIfTZwA8zjA6n2EHTqHUOkGxLRNZhsquo97wYU8KAftzRmUJfnzDSp+YD+MiNhuC44BKHt0ANbiomMdS8o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747072375; c=relaxed/simple; bh=WQ0jr0zYryb5WfedHh0/cGrK4Lu1+iKOTqU9I60KXk0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FWdGAVt2mHAfiSTGOsWukI4ZxgvMKLhl9GvnxFOYq7CGXggbRgxj6GO5ZIf+vUy51Rw+UWovjweoYs3klJN5VY6kd4RcH6nH7GgXIVVxDh9/G87ONjxcZcP41Vb3ULgnTfvMPGJmIsEDl5E232qgz9RCcouSgw3IyBxXKb63Xv4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OsjhV1rt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OsjhV1rt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53B76C4CEE9; Mon, 12 May 2025 17:52:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1747072374; bh=WQ0jr0zYryb5WfedHh0/cGrK4Lu1+iKOTqU9I60KXk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OsjhV1rtCcAGataEFbR8L4QMDhpUGfyQlvLB7qQPkw5wYw3tHhMApe3gFRAEN7mhr 5QnEP3QUeDY56oquGolJmG+BOLC2oyKEcJ6AF4grVerI/A6JI4F/tHd/FHzm2w1kOn T9YYUfcl0gDe00P2WZx/D/Kkge+nyVj++R2eFns4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jonas Gorski , Florian Fainelli , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 20/92] net: dsa: b53: fix VLAN ID for untagged vlan on bridge leave Date: Mon, 12 May 2025 19:44:55 +0200 Message-ID: <20250512172023.943382300@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250512172023.126467649@linuxfoundation.org> References: <20250512172023.126467649@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jonas Gorski [ Upstream commit a1c1901c5cc881425cc45992ab6c5418174e9e5a ] The untagged default VLAN is added to the default vlan, which may be one, but we modify the VLAN 0 entry on bridge leave. Fix this to use the correct VLAN entry for the default pvid. Fixes: fea83353177a ("net: dsa: b53: Fix default VLAN ID") Signed-off-by: Jonas Gorski Tested-by: Florian Fainelli Reviewed-by: Florian Fainelli Link: https://patch.msgid.link/20250429201710.330937-6-jonas.gorski@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/dsa/b53/b53_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index cff0e1ecaca51..bffd23ff6e134 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1923,7 +1923,7 @@ EXPORT_SYMBOL(b53_br_join); void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge) { struct b53_device *dev = ds->priv; - struct b53_vlan *vl = &dev->vlans[0]; + struct b53_vlan *vl; s8 cpu_port = dsa_to_port(ds, port)->cpu_dp->index; unsigned int i; u16 pvlan, reg, pvid; @@ -1949,6 +1949,7 @@ void b53_br_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge) dev->ports[port].vlan_ctl_mask = pvlan; pvid = b53_default_pvid(dev); + vl = &dev->vlans[pvid]; /* Make this port join all VLANs without VLAN entries */ if (is58xx(dev)) { -- 2.39.5