From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A777C433F5 for ; Mon, 15 Nov 2021 18:46:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E4390635F2 for ; Mon, 15 Nov 2021 18:46:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242618AbhKOStm (ORCPT ); Mon, 15 Nov 2021 13:49:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:51382 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242838AbhKOSqf (ORCPT ); Mon, 15 Nov 2021 13:46:35 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C52DD6331C; Mon, 15 Nov 2021 18:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1636999625; bh=LqB4mW/Iahc4WSQEWaRmcSjU3xOXUljaega4n7VArFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R3HPZIAt6zb+4u8unSCYmTzVsgwmAjT4IenpI+cUDfgKzo8+4K8ryP4zAXWz/Dxc8 Hcve962rCecFhkv8JMa+aEeYfLJYHk0K4FXlZOcGimJlQxRS6LGSAKkaq1Q+sr1oih CL8ZiLlYeF3BxU+j6aA5aTOxCSv+VhcEcq1m4pKg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauri Sandberg , DENG Qingfang , =?UTF-8?q?Alvin=20=C5=A0ipraga?= , Vladimir Oltean , Florian Fainelli , Linus Walleij , "David S. Miller" , Sasha Levin Subject: [PATCH 5.14 366/849] net: dsa: rtl8366: Fix a bug in deleting VLANs Date: Mon, 15 Nov 2021 17:57:29 +0100 Message-Id: <20211115165432.617915670@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165419.961798833@linuxfoundation.org> References: <20211115165419.961798833@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit d8251b9db34a2cbc5619b610e7e8aad1d165c531 ] We were checking that the MC (member config) was != 0 for some reason, all we need to check is that the config has no ports, i.e. no members. Then it can be recycled. This must be some misunderstanding. Fixes: 4ddcaf1ebb5e ("net: dsa: rtl8366: Properly clear member config") Cc: Mauri Sandberg Cc: DENG Qingfang Reviewed-by: Alvin Šipraga Reviewed-by: Vladimir Oltean Reviewed-by: Florian Fainelli Signed-off-by: Linus Walleij Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/rtl8366.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 75897a3690969..ffbe5b6b2655b 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -457,7 +457,7 @@ int rtl8366_vlan_del(struct dsa_switch *ds, int port, * anymore then clear the whole member * config so it can be reused. */ - if (!vlanmc.member && vlanmc.untag) { + if (!vlanmc.member) { vlanmc.vid = 0; vlanmc.priority = 0; vlanmc.fid = 0; -- 2.33.0