diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2017-09-25 23:32:20 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-09-28 09:45:06 -0700 |
| commit | db06ae41945b14feb7f696dcafe8048cc37e8a20 (patch) | |
| tree | b2e8be02a049436d01b1a7c5119931ba9a8eb6a6 /drivers/net | |
| parent | inetpeer: fix RCU lookup() again (diff) | |
| download | linux-dev-db06ae41945b14feb7f696dcafe8048cc37e8a20.tar.xz linux-dev-db06ae41945b14feb7f696dcafe8048cc37e8a20.zip | |
net: dsa: mv88e6xxx: Allow dsa and cpu ports in multiple vlans
Ports with the same VLAN must all be in the same bridge. However the
CPU and DSA ports need to be in multiple VLANs spread over multiple
bridges. So exclude them when performing this test.
Fixes: b2f81d304cee ("net: dsa: add CPU and DSA ports as VLAN members")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index c6678aa9b4ef..674dab71d71c 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1100,6 +1100,10 @@ static int mv88e6xxx_port_check_hw_vlan(struct dsa_switch *ds, int port, }; int i, err; + /* DSA and CPU ports have to be members of multiple vlans */ + if (dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port)) + return 0; + if (!vid_begin) return -EOPNOTSUPP; |