Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Florian Fainelli <f.fainelli@gmail.com>
To:     netdev@vger.kernel.org
Cc:     olteanv@gmail.com, hkallweit1@gmail.com, michal.vokac@ysoft.com,
        Florian Fainelli <f.fainelli@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        linux-kernel@vger.kernel.org (open list)
Subject: [PATCH net] net: dsa: Treat VLAN ID 0 as PVID untagged
Date:   Wed, 12 Feb 2020 12:05:55 -0800
Message-Id: <20200212200555.2393-1-f.fainelli@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

VLAN ID 0 is special by all kinds and is really meant to be the default
ingress and egress untagged VLAN. We were not configuring it that way
and so we would be ingress untagged but egress tagged.

When our devices are interfaced with other link partners such as switch
devices, the results would be entirely equipment dependent. Some
switches are completely fine with accepting an egress tagged frame with
VLAN ID 0 and would send their responses untagged, so everything works,
but other devices are not so tolerant and would typically reject a VLAN
ID 0 tagged frame.

Fixes: 061f6a505ac3 ("net: dsa: Add ndo_vlan_rx_{add, kill}_vid implementation")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Hi all,

After looking at all DSA drivers and how they implement port_vlan_add()
I think this is the right change to do, but would appreciate if you
could test this on your respective platforms to ensure this is not
problematic.

Thank you


 net/dsa/slave.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 088c886e609e..d3a2782eb94d 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1100,6 +1100,7 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
 {
 	struct dsa_port *dp = dsa_slave_to_port(dev);
 	struct bridge_vlan_info info;
+	u16 flags = 0;
 	int ret;
 
 	/* Check for a possible bridge VLAN entry now since there is no
@@ -1118,7 +1119,13 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
 			return -EBUSY;
 	}
 
-	ret = dsa_port_vid_add(dp, vid, 0);
+	/* VLAN ID 0 is special and should be the default egress and ingress
+	 * untagged VLAN, make sure it gets programmed as such.
+	 */
+	if (vid == 0)
+		flags = BRIDGE_VLAN_INFO_PVID | BRIDGE_VLAN_INFO_UNTAGGED;
+
+	ret = dsa_port_vid_add(dp, vid, flags);
 	if (ret)
 		return ret;
 
-- 
2.17.1