Received: by 2002:a05:6a10:2785:0:0:0:0 with SMTP id ia5csp331139pxb; Wed, 13 Jan 2021 04:59:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwHTRYeui7FSwa3pKwzlKs/x+5WBz+YjPbzjgIJ0+n/8ZpZAiym+R7NFfjww1BtI6GibFJ7 X-Received: by 2002:a05:6402:1593:: with SMTP id c19mr1711715edv.269.1610542760406; Wed, 13 Jan 2021 04:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610542760; cv=none; d=google.com; s=arc-20160816; b=ExZQyGsflgpkzjEdXbgCskOKzcBAUIqoKj9d2yhf7CM0W3VUa2Yo2gBvRcXdK+hqdg X21Z78Vg0jMiNiI5TwFglUABNpf1V95s/TZuK9t5zvKYoUBxjPohbG8+0U8tIFPq+nvP 8Hxx2lO9dntmkMS6+Mgz9PdIyocW0VnJrz1zwCo02jACw3258nTydi2roNIm9kYdn+dk 2FfZ+kAgcmAbHXRyozZSgJYQlbzDXoZ/UUaV5ROMp9GfgedBZlFwa/hMIYiPSZmq9RA+ a8RQuyvVB81i/vs8sB2VORMCtCqDS+LP1yCuzG6QPYJ8PG0BlczvnjuFtfKYiut8R4f5 NSPQ== 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; bh=YNOQz4kjUvioCG1Bh7YQvkxPvdAAZgW0lozeMR6y5G8=; b=Cc6IN6hftxOyB1EdSZiL+lDNbHlt6he1EGpRIGqUoDMpc6yiYroL3bSf8z4BMpbzDZ TBJyLJS9V2+Ztw1bsrgQZstwcm0A4NMPM7pVu5lycCABYI8V/i7sofXHNJNGJPCoOPnY 8KWYVz07JqbsWUSmPCrRoV41WxT/poCwmgIl0ocGXu3TUi36ymIf580yN4cp4jOGrWHF gJg0k6mZiD1XMZlJuHXTh2fukTFtk5oSS25JbM3+qDJ6xja7aXWj3bSetUx5dtj5+mrW tz6lArNZy8iHCYkGTDuY7r+PAj93eJoMehAYIjsUHzP2k75t0wp7FBWT1h5LeZ51BrSW c1DA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o17si898765edz.79.2021.01.13.04.58.56; Wed, 13 Jan 2021 04:59:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727560AbhAMM4d (ORCPT + 99 others); Wed, 13 Jan 2021 07:56:33 -0500 Received: from mail.savoirfairelinux.com ([208.88.110.44]:39230 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726222AbhAMM4b (ORCPT ); Wed, 13 Jan 2021 07:56:31 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 7E75D9C0DD5; Wed, 13 Jan 2021 07:45:42 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id MRdasevrwtCY; Wed, 13 Jan 2021 07:45:42 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 1CBEC9C0DD0; Wed, 13 Jan 2021 07:45:42 -0500 (EST) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id p1xrnGGU0hhJ; Wed, 13 Jan 2021 07:45:42 -0500 (EST) Received: from gdo-desktop.home (pop.92-184-98-96.mobile.abo.orange.fr [92.184.98.96]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 1BFF29C0DCC; Wed, 13 Jan 2021 07:45:39 -0500 (EST) From: Gilles DOFFE To: netdev@vger.kernel.org Cc: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , linux-kernel@vger.kernel.org Subject: [PATCH net 4/6] net: dsa: ksz: do not change tagging on del Date: Wed, 13 Jan 2021 13:45:20 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If a VLAN is removed, the tagging policy should not be changed as still active VLANs could be impacted. Signed-off-by: Gilles DOFFE --- drivers/net/dsa/microchip/ksz8795.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microc= hip/ksz8795.c index 193f03ef9160..b55fb2761993 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -880,7 +880,6 @@ static void ksz8795_port_vlan_add(struct dsa_switch *= ds, int port, static int ksz8795_port_vlan_del(struct dsa_switch *ds, int port, const struct switchdev_obj_port_vlan *vlan) { - bool untagged =3D vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED; struct ksz_device *dev =3D ds->priv; u16 data, vid, pvid, new_pvid =3D 0; u8 fid, member, valid; @@ -888,8 +887,6 @@ static int ksz8795_port_vlan_del(struct dsa_switch *d= s, int port, ksz_pread16(dev, port, REG_PORT_CTRL_VID, &pvid); pvid =3D pvid & 0xFFF; =20 - ksz_port_cfg(dev, port, P_TAG_CTRL, PORT_REMOVE_TAG, untagged); - for (vid =3D vlan->vid_begin; vid <=3D vlan->vid_end; vid++) { ksz8795_r_vlan_table(dev, vid, &data); ksz8795_from_vlan(data, &fid, &member, &valid); --=20 2.25.1