From 407308f60d46e50d258143f0bd38adc3f780908e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 15 Jun 2019 13:35:29 -0700 Subject: [PATCH] Revert "net: dsa: mv88e6xxx: do not flood CPU with unknown multicast" This reverts commit 422efd032775757c41e9579facd9656a87bf4f00. It breaks ipv6. Signed-off-by: David S. Miller --- drivers/net/dsa/mv88e6xxx/chip.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 9b3d6091d300..6691120bd283 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -2058,13 +2058,15 @@ static int mv88e6xxx_setup_message_port(struct mv88e6xxx_chip *chip, int port) static int mv88e6xxx_setup_egress_floods(struct mv88e6xxx_chip *chip, int port) { struct dsa_switch *ds = chip->ds; - bool uc = dsa_is_dsa_port(ds, port) || dsa_is_cpu_port(ds, port); - bool mc = dsa_is_dsa_port(ds, port); + bool flood; - if (!chip->info->ops->port_set_egress_floods) - return 0; + /* Upstream ports flood frames with unknown unicast or multicast DA */ + flood = dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port); + if (chip->info->ops->port_set_egress_floods) + return chip->info->ops->port_set_egress_floods(chip, port, + flood, flood); - return chip->info->ops->port_set_egress_floods(chip, port, uc, mc); + return 0; } static int mv88e6xxx_serdes_power(struct mv88e6xxx_chip *chip, int port,