net: dsa: Pass dsa_port reference to ethtool setup/restore

We do not need to have a reference to a dsa_switch, instead we should
pass a reference to a CPU dsa_port, change that. This is a preliminary
change to better support multiple CPU ports.

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

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 402459e73f33aba0408ac48a77cf3a637c58b5f7..fdc448b30e567b2ae66e070ccc70846f45ad1e36 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -112,8 +112,9 @@ const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol)
        return ops;
 }
 
-int dsa_cpu_port_ethtool_setup(struct dsa_switch *ds)
+int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp)
 {
+       struct dsa_switch *ds = cpu_dp->ds;
        struct net_device *master;
        struct ethtool_ops *cpu_ops;
 
@@ -136,8 +137,9 @@ int dsa_cpu_port_ethtool_setup(struct dsa_switch *ds)
        return 0;
 }
 
-void dsa_cpu_port_ethtool_restore(struct dsa_switch *ds)
+void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp)
 {
+       struct dsa_switch *ds = cpu_dp->ds;
        struct net_device *master;
 
        master = ds->dst->master_netdev;

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 21b44a9828f6b7f2c8a1d7f34002e6acfd0524b2..7f9bf1456a65bd100065b13bbf36c89772c0a3f2 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -444,7 +444,7 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst)
        }
 
        if (dst->cpu_dp) {
-               err = dsa_cpu_port_ethtool_setup(dst->cpu_dp->ds);
+               err = dsa_cpu_port_ethtool_setup(dst->cpu_dp);
                if (err)
                        return err;
        }
@@ -485,7 +485,7 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst)
        }
 
        if (dst->cpu_dp)
-               dsa_cpu_port_ethtool_restore(dst->cpu_dp->ds);
+               dsa_cpu_port_ethtool_restore(dst->cpu_dp);
 
        pr_info("DSA: tree %d unapplied\n", dst->tree);
        dst->applied = false;

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index db2a7b9edfb8b5669c64e1f8354de6b7dd5a57d4..66ee248796c8bfc2cb5987ae05b44e128484ea4f 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -103,8 +103,8 @@ int dsa_cpu_dsa_setup(struct dsa_switch *ds, struct device *dev,
                      struct dsa_port *dport, int port);
 void dsa_cpu_dsa_destroy(struct dsa_port *dport);
 const struct dsa_device_ops *dsa_resolve_tag_protocol(int tag_protocol);
-int dsa_cpu_port_ethtool_setup(struct dsa_switch *ds);
-void dsa_cpu_port_ethtool_restore(struct dsa_switch *ds);
+int dsa_cpu_port_ethtool_setup(struct dsa_port *cpu_dp);
+void dsa_cpu_port_ethtool_restore(struct dsa_port *cpu_dp);
 
 /* legacy.c */
 int dsa_legacy_register(void);

diff --git a/net/dsa/legacy.c b/net/dsa/legacy.c
index d70a1a788d174724416572e499af1cc9ad515b7a..d534d8f4b9cfa413d1a3779a011f0194b97a2928 100644 (file)
--- a/net/dsa/legacy.c
+++ b/net/dsa/legacy.c
@@ -205,7 +205,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                netdev_err(dst->master_netdev, "[%d] : can't configure CPU and DSA ports\n",
                           index);
 
-       ret = dsa_cpu_port_ethtool_setup(ds);
+       ret = dsa_cpu_port_ethtool_setup(ds->dst->cpu_dp);
        if (ret)
                return ret;
 
@@ -733,7 +733,7 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst)
                        dsa_switch_destroy(ds);
        }
 
-       dsa_cpu_port_ethtool_restore(dst->cpu_dp->ds);
+       dsa_cpu_port_ethtool_restore(dst->cpu_dp);
 
        dev_put(dst->master_netdev);
 }