From patchwork Fri Feb 15 20:16:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1043166 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WXE70Rho"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441PgW4Z2wz9sDr for ; Sat, 16 Feb 2019 07:17:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403855AbfBOURJ (ORCPT ); Fri, 15 Feb 2019 15:17:09 -0500 Received: from mail-yw1-f66.google.com ([209.85.161.66]:46840 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391129AbfBOURI (ORCPT ); Fri, 15 Feb 2019 15:17:08 -0500 Received: by mail-yw1-f66.google.com with SMTP id n12so4161411ywn.13 for ; Fri, 15 Feb 2019 12:17:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4H6I855rntrFBs6LXCvj8b+q8wX2M2JQx1AvLZnRbZY=; b=WXE70Rho2WYxTxzqnbz+wp14JGqZt3NpcaHETzdXKyQwJXaVuqV//Ayhd8ee8oNS1i oeNB8XIbvK6Vd6vAuVrdLA4OxKx3A/4DOtjGaR+jx/eu5I6S89SIVgH1GiTR2HygVDFA xXZCm4Y1WYWDQ6CmVorvGX0mbfvLiwx+XrUMyyUbQ4v1Cw3uh78Q0R26MJ6wT+4dVEnI 3PkV06z8CtZf8ApUmfRide2/9Jfop1qBv7h6zZgteYNTq2ZHSZUuRcD0SgXdknuk69jg lk2NqlDENtuJdlgvXohzda9Mc0AdWIyzpaWVN4YviBoxC+uKLNL9O7H9QbD+Hos8E3pv QtRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4H6I855rntrFBs6LXCvj8b+q8wX2M2JQx1AvLZnRbZY=; b=tDzC0DxEiT6a4ogQBLPuBXQAIU5QmiD6N13m027f3h62QirbFzLQQ06rlvEX+a6X2/ 4Nb7H7B9crc8a+9FMslI7OF8gVZcb0x7IxINNcn3y9hyrEWwonHWICbzeaBKPXxemFlx zwhvCjwf87MYHc9Tr70sAukEzSGeABbkTmAaXmQj2bkCssFs9J4SGIVcJsSJsFUeI7jd iaV1z8OdApYPxJykjQG1gi86u7NNodo7rqIgFbFUu92fZGghdf23lmEabK2nzf7xE+Un kbBX1v3PrQM9A157EOOPzSJX0VaK2Bl82do2xawiCj/JVNDWHbjbJMG9jVT9b1fGKSOD Ouvw== X-Gm-Message-State: AHQUAubugv4nT7gKiFba5u3868hchvjUu/iLX5e3bGGCChOPxI0GzgZr HegXry6HFV6UCrJsp38IYme0xQwG X-Google-Smtp-Source: AHgI3IYhxDXgZAlg8ubrDaKX4AtMf4QvMFMH33NyyyR7TLzSdjBU7tncADO0Dg14MovpmYjXLgcq+A== X-Received: by 2002:a81:34a:: with SMTP id 71mr9852303ywd.131.1550261826623; Fri, 15 Feb 2019 12:17:06 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id y67sm2889574ywf.89.2019.02.15.12.17.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 12:17:05 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: davem@davemloft.net, andrew@lunn.ch, vivien.didelot@gmail.com, Florian Fainelli Subject: [PATCH net 5/5] net: dsa: b53: Do not program CPU port's PVID Date: Fri, 15 Feb 2019 12:16:53 -0800 Message-Id: <20190215201653.20988-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190215201653.20988-1-f.fainelli@gmail.com> References: <20190215201653.20988-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The CPU port is special and does not need to obey VLAN restrictions as far as untagged traffic goes, also, having the CPU port be part of a particular PVID is against the idea of keeping it tagged in all VLANs. Fixes: ca8931948344 ("net: dsa: b53: Keep CPU port as tagged in all VLANs") Signed-off-by: Florian Fainelli --- drivers/net/dsa/b53/b53_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 2fef4c564420..c76892ac4e69 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -1359,7 +1359,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port, b53_fast_age_vlan(dev, vid); } - if (pvid) { + if (pvid && !dsa_is_cpu_port(ds, port)) { b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_PORT_DEF_TAG(port), vlan->vid_end); b53_fast_age_vlan(dev, vid);