Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db06ae41 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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: b2f81d30 ("net: dsa: add CPU and DSA ports as VLAN members")
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35f493b8

drivers/net/dsa/mv88e6xxx/chip.c

+4 −0
Original line number Diff line number Diff line
@@ -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;