From patchwork Sat Sep 25 22:59:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 514634 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp2775972jao; Sat, 25 Sep 2021 16:02:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaPoN60LubtpXlmQuqM1D7WqTIX+/+VOCreuAVxUsne+fe2V/+7S3IlgR0PKBfDm2eA1BK X-Received: by 2002:a6b:7016:: with SMTP id l22mr14748034ioc.48.1632610923223; Sat, 25 Sep 2021 16:02:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632610923; cv=none; d=google.com; s=arc-20160816; b=hycNssnCArkJkoy5f04zvp34LUL40mOAHJTqCB8hvnOOb5YTykjVqi3CVPx7rs4uL7 GwAP2TQEZTBAt/tBbx+ZkThzrmkS+LrB/Hifw4tCxzty+dSemKjhSKjPclp6oqswv1UV VYAhUWhQ7qHom92MbOvWsmPwcFWVc9f42RUlKQELS0OMJA6RTf85vKGTPIEdx9bX4gay W0tF7c/8MyTMkoHiT2Ydi4utPQRofr4ury/fYwfcYflNcatr/6i7BRBdESEMNm2vsR+U WJeBO0Lh4ykJ3xvZd097vsQOzQQlV7t/Z0ctoCl0qLgf6+7E6sPtER/3sG5aWSznzvQE /V8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aEbVU1x57FyQIizkQNokEr+/kzDXEj5p9oOADNfgO3o=; b=CeCsHnskk5BIUYE5n0l8Hm+1O11GkhLS+0bO0pv0giimzauZ+PLAW2MZpoIKDMbj9E Kc0oykcMrlc0NwY/QKjcaqRfOUw/977NYNbOpJkFzrYqPaLwiKgc1K9i9UT0SFRtpu1/ aEmC0kHd/pqTUTE4gyRRodZvMi2oCcJdXk2kbPU3kH7XyqWCRY7UBZK3cN/pqTS2d2Sa G8W/l/VuOifY/gLU6upT1pgIJJkF++RQq6lQcEEs7bJSaUhf7R8wNlrQ7EfBW4hATmgS etvEMBrxZW2wq7t7RDPaTbvKfyF6XD/DBrPZWi/13p+pE59/gxKMwsV/oCEgNkqreY+V dysA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zX1p4w34; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si20127962iov.104.2021.09.25.16.02.03; Sat, 25 Sep 2021 16:02:03 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zX1p4w34; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230222AbhIYXDh (ORCPT + 8 others); Sat, 25 Sep 2021 19:03:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230207AbhIYXDd (ORCPT ); Sat, 25 Sep 2021 19:03:33 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B656C061740 for ; Sat, 25 Sep 2021 16:01:58 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id u8so56650933lff.9 for ; Sat, 25 Sep 2021 16:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aEbVU1x57FyQIizkQNokEr+/kzDXEj5p9oOADNfgO3o=; b=zX1p4w34JlmsFP7th4iRnPU5Y4gl28/MSTRDbgahObrRZfeFcQyp6Cun1uLuL7ZRgh XbJxbpvTZbZnEIWY2HFP6Zzz9vUzAvofY1tFRt+RfmKRoyKQ0iLkq/Z+8P6QemaaNZ3X mWkgtzYUu6QeHzDBEH5rX8foGmgnIB11UFOq9eTIHts7uxVfwnH1X4zuMzPWkFRgGu+H aUCobVYvXUp/q2qc2xp7IcfhexaHR+4Zj3RuvMrOOMS1L400UjzM1HnPQr8ZCdJiJ4ks 6ZMelXBsdiApbiXWc4nQVTuLLbPrC3kDNXv1xSeSQGJfHFrwadRiPGe67br4+YMMQ1up VPUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aEbVU1x57FyQIizkQNokEr+/kzDXEj5p9oOADNfgO3o=; b=1T+wo85zg/E+3matGmqU8QBLe5jBv1F3csZIN/B5gpUgQdPPyVCgsWS0KNkVbbJvK7 OQfX+5++RqzCX4C6PXh4c7rwlz0Rmu2poAHtNajl2a6fVGHS2MHiN/RNcA8y5VS8uEFD NQtXE38DjGrWxKtDn4sj0cJT8Uvn1+NVbOMMX7qhrBPJwTy7g5wjIP+KP82HOEzLlLQI PwNhgynN8TrW8njbrX9ncbKYRDeknjUvB+HNrHpMI28QzKgVToGVpAt0pgrCpleXCjjA 7jq6hoMqLckHtN6MKU18ubfuBxse7nDoypPYUbwyWG3EgczURUsLLGjKynj93yCwxuD9 4rTw== X-Gm-Message-State: AOAM533DWkKwABE0DoOFBmmvw4HATpp+fOv9rdYI2oacSDnDRjpLF4D7 RYySW17NvdcjCt3OvE1UOMPaQg== X-Received: by 2002:ac2:5e23:: with SMTP id o3mr16860180lfg.352.1632610916457; Sat, 25 Sep 2021 16:01:56 -0700 (PDT) Received: from localhost.localdomain (c-fdcc225c.014-348-6c756e10.bbcust.telenor.se. [92.34.204.253]) by smtp.gmail.com with ESMTPSA id d27sm1448111ljo.119.2021.09.25.16.01.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 16:01:56 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Jakub Kicinski Cc: netdev@vger.kernel.org, Linus Walleij , Mauri Sandberg , DENG Qingfang , =?utf-8?q?Alvin_=C5=A0ipraga?= Subject: [PATCH net-next 5/6 v7] net: dsa: rtl8366: Fix a bug in deleting VLANs Date: Sun, 26 Sep 2021 00:59:28 +0200 Message-Id: <20210925225929.2082046-6-linus.walleij@linaro.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210925225929.2082046-1-linus.walleij@linaro.org> References: <20210925225929.2082046-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- ChangeLog v6->v7: - Collect Alvin's and Vladimir's review tags. ChangeLog v5->v6: - No changes just resending with the rest of the patches. ChangeLog v4->v5: - Collect Florians review tag - Add Fixes tag ChangeLog v1->v4: - New patch for a bug found while fixing the other issues. --- drivers/net/dsa/rtl8366.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.31.1 diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 0672dd56c698..f815cd16ad48 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -374,7 +374,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;