diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-02-02 14:21:31 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-02 14:21:31 -0800 |
| commit | d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a (patch) | |
| tree | f43b81751cb5c5736268057ecdbcdb99dd00e826 /drivers/net/dsa | |
| parent | 9ae4bdc6e4c1281ddf8d6335bea35864d086cbf9 (diff) | |
| parent | 3aaf0a27ffc29b19a62314edd684b9bc6346f9a8 (diff) | |
| download | linux-d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index b99f27b8c084..ae0b490f00cd 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1686,7 +1686,11 @@ static int mv88e6xxx_port_db_load_purge(struct mv88e6xxx_chip *chip, int port, if (!entry.portvec) entry.state = 0; } else { - entry.portvec |= BIT(port); + if (state == MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC) + entry.portvec = BIT(port); + else + entry.portvec |= BIT(port); + entry.state = state; } |