OSDN Git Service

Revert "net: dsa: mv88e6xxx: do not flood CPU with unknown multicast"
authorDavid S. Miller <davem@davemloft.net>
Sat, 15 Jun 2019 20:35:29 +0000 (13:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 15 Jun 2019 20:35:29 +0000 (13:35 -0700)
This reverts commit 422efd032775757c41e9579facd9656a87bf4f00.

It breaks ipv6.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/dsa/mv88e6xxx/chip.c

index 9b3d609..6691120 100644 (file)
@@ -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,