diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-23 14:30:47 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-23 14:30:47 +0300 |
| commit | f95b23a112f1a31ea042483540cd907b58d23a5f (patch) | |
| tree | 3d41d2f8cf1d66ed593deb12f25a30d2905eb077 /drivers/net/dsa/mv88e6xxx/chip.c | |
| parent | da20ab35180780e4a6eadc804544f1fa967f3567 (diff) | |
| parent | 58c3862b521ead4f69a24ef009a679cb3c519620 (diff) | |
| download | linux-f95b23a112f1a31ea042483540cd907b58d23a5f.tar.xz | |
Merge branch 'x86/urgent' into x86/asm, to pick up dependent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/dsa/mv88e6xxx/chip.c')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index c6678aa9b4ef..d74c7335c512 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; @@ -3947,7 +3951,9 @@ static void mv88e6xxx_remove(struct mdio_device *mdiodev) if (chip->irq > 0) { if (chip->info->g2_irqs > 0) mv88e6xxx_g2_irq_free(chip); + mutex_lock(&chip->reg_lock); mv88e6xxx_g1_irq_free(chip); + mutex_unlock(&chip->reg_lock); } } |