From: David S. Miller Date: Wed, 28 Aug 2019 03:17:28 +0000 (-0700) Subject: Merge branch 'net-dsa-explicit-programmation-of-VLAN-on-CPU-ports' X-Git-Tag: v5.4-rc1~131^2~144 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=cb6ec9754b1a4b23e5c6b890af600aade18c0ba8;p=linux.git Merge branch 'net-dsa-explicit-programmation-of-VLAN-on-CPU-ports' Vivien Didelot says: ==================== net: dsa: explicit programmation of VLAN on CPU ports When a VLAN is programmed on a user port, every switch of the fabric also program the CPU ports and the DSA links as part of the VLAN. To do that, DSA makes use of bitmaps to prepare all members of a VLAN. While this is expected for DSA links which are used as conduit between interconnected switches, only the dedicated CPU port of the slave must be programmed, not all CPU ports of the fabric. This may also cause problems in other corners of DSA such as the tag_8021q.c driver, which needs to program its ports manually, CPU port included. We need the dsa_port_vlan_{add,del} functions and its dsa_port_vid_{add,del} variants to simply trigger the VLAN programmation without any logic in them, but they may currently skip the operation based on the bridge device state. This patchset gets rid of the bitmap operations, and moves the bridge device check as well as the explicit programmation of CPU ports where they belong, in the slave code. While at it, clear the VLAN flags before programming a CPU port, as it doesn't make sense to forward the PVID flag for example for such ports. Changes in v2: only clear the PVID flag. ==================== Tested-by: Vladimir Oltean Signed-off-by: David S. Miller --- cb6ec9754b1a4b23e5c6b890af600aade18c0ba8