net: dsa: mv88e6131: drop frames priorities setup

6131 is the only driver which setups the priority of IGMP/MLD snoop
frames and ARP frames to the highest setting. Drop such change until we
figure out a common configuration for all switch models.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c
index b6ca07b9b938843da09e59511f03ce43367f0279..da283272667296d7e9e1885197e6902580cd1b50 100644 (file)
--- a/drivers/net/dsa/mv88e6131.c
+++ b/drivers/net/dsa/mv88e6131.c
@@ -58,20 +58,6 @@ static const char *mv88e6131_drv_probe(struct device *dsa_dev,
                                   ARRAY_SIZE(mv88e6131_table));
 }
 
-static int mv88e6131_setup_global(struct dsa_switch *ds)
-{
-       struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
-
-       /* Force the priority of IGMP/MLD snoop frames and ARP frames
-        * to the highest setting.
-        */
-       return mv88e6xxx_reg_write(ps, REG_GLOBAL2, GLOBAL2_PRIO_OVERRIDE,
-                                  GLOBAL2_PRIO_OVERRIDE_FORCE_SNOOP |
-                                  7 << GLOBAL2_PRIO_OVERRIDE_SNOOP_SHIFT |
-                                  GLOBAL2_PRIO_OVERRIDE_FORCE_ARP |
-                                  7 << GLOBAL2_PRIO_OVERRIDE_ARP_SHIFT);
-}
-
 static int mv88e6131_setup(struct dsa_switch *ds)
 {
        struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
@@ -83,10 +69,6 @@ static int mv88e6131_setup(struct dsa_switch *ds)
        if (ret < 0)
                return ret;
 
-       ret = mv88e6131_setup_global(ds);
-       if (ret < 0)
-               return ret;
-
        return mv88e6xxx_setup_ports(ds);
 }