net: dsa: pass bridge down to drivers

Some DSA drivers may or may not support multiple software bridges on top
of an hardware switch.

It is more convenient for them to access the bridge's net_device for
finer configuration.

Removing the need to craft and access a bitmask also simplifies the
code.

This patch changes the signature of bridge related functions, update DSA
drivers, and removes dsa_slave_br_port_mask.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 3 deletions

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 26a0e86e611e..1c845d7bf0b2 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -297,9 +297,8 @@ struct dsa_switch_driver {
          * Bridge integration
          */
         int     (*port_join_bridge)(struct dsa_switch *ds, int port,
-                                    u32 br_port_mask);
-        int     (*port_leave_bridge)(struct dsa_switch *ds, int port,
-                                     u32 br_port_mask);
+                                    struct net_device *bridge);
+        int     (*port_leave_bridge)(struct dsa_switch *ds, int port);
         int     (*port_stp_update)(struct dsa_switch *ds, int port,
                                    u8 state);