net: dsa: keep the bridge_dev and bridge_num as part of the same structure

[linux-block.git] / drivers / net / dsa / xrs700x / xrs700x.c

diff --git a/drivers/net/dsa/xrs700x/xrs700x.c b/drivers/net/dsa/xrs700x/xrs700x.c
index 7c2b6c32242d8d16100c8664b3f04cabc6e9fbfa..ebb55dfd9c4e76a4975e834808c9ab8efbedd3c4 100644 (file)
--- a/drivers/net/dsa/xrs700x/xrs700x.c
+++ b/drivers/net/dsa/xrs700x/xrs700x.c
@@ -501,7 +501,7 @@ static void xrs700x_mac_link_up(struct dsa_switch *ds, int port,
 }
 
 static int xrs700x_bridge_common(struct dsa_switch *ds, int port,
-                                struct net_device *bridge, bool join)
+                                struct dsa_bridge bridge, bool join)
 {
        unsigned int i, cpu_mask = 0, mask = 0;
        struct xrs700x *priv = ds->priv;
@@ -513,14 +513,14 @@ static int xrs700x_bridge_common(struct dsa_switch *ds, int port,
 
                cpu_mask |= BIT(i);
 
-               if (dsa_port_bridge_dev_get(dsa_to_port(ds, i)) == bridge)
+               if (dsa_port_offloads_bridge(dsa_to_port(ds, i), &bridge))
                        continue;
 
                mask |= BIT(i);
        }
 
        for (i = 0; i < ds->num_ports; i++) {
-               if (dsa_port_bridge_dev_get(dsa_to_port(ds, i)) != bridge)
+               if (!dsa_port_offloads_bridge(dsa_to_port(ds, i), &bridge))
                        continue;
 
                /* 1 = Disable forwarding to the port */
@@ -540,13 +540,13 @@ static int xrs700x_bridge_common(struct dsa_switch *ds, int port,
 }
 
 static int xrs700x_bridge_join(struct dsa_switch *ds, int port,
-                              struct net_device *bridge)
+                              struct dsa_bridge bridge)
 {
        return xrs700x_bridge_common(ds, port, bridge, true);
 }
 
 static void xrs700x_bridge_leave(struct dsa_switch *ds, int port,
-                                struct net_device *bridge)
+                                struct dsa_bridge bridge)
 {
        xrs700x_bridge_common(ds, port, bridge, false);
 }