net: dsa: use cpu_switch instead of ds[0]

Now that the DSA Ethernet switches are true Linux devices, the CPU
switch is not necessarily the first one. If its address is higher than
the second switch on the same MDIO bus, its index will be 1, not 0.

Avoid any confusion by using dst->cpu_switch instead of dst->ds[0].

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 020e072b4299..866222a8f9bf 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -377,8 +377,8 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
                         return err;
         }
 
-        if (dst->ds[0]) {
-                err = dsa_cpu_port_ethtool_setup(dst->ds[0]);
+        if (dst->cpu_switch) {
+                err = dsa_cpu_port_ethtool_setup(dst->cpu_switch);
                 if (err)
                         return err;
         }
@@ -418,8 +418,8 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
                 dsa_ds_unapply(dst, ds);
         }
 
-        if (dst->ds[0])
-                dsa_cpu_port_ethtool_restore(dst->ds[0]);
+        if (dst->cpu_switch)
+                dsa_cpu_port_ethtool_restore(dst->cpu_switch);
 
         pr_info("DSA: tree %d unapplied\n", dst->tree);
         dst->applied = false;