Florian Fainelli <f.faine...@gmail.com> writes:
> In preparation for supporting multiple CPU ports with DSA, have the
> dsa_slave_priv structure know which CPU it is associated with. This will
dsa_port
> be important in order to make sure the correct CPU is used for
> transmission of the frames. If not for functional reasons, for
> performance (e.g: load balancing) and forwarding decisions.
>
> Signed-off-by: Florian Fainelli <f.faine...@gmail.com>
> ---
> include/net/dsa.h | 1 +
> net/dsa/dsa_priv.h | 2 +-
> net/dsa/slave.c | 5 ++++-
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/dsa.h b/include/net/dsa.h
> index 7e93869819f9..58969b9a090c 100644
> --- a/include/net/dsa.h
> +++ b/include/net/dsa.h
> @@ -171,6 +171,7 @@ struct dsa_port {
> struct dsa_switch *ds;
> unsigned int index;
> const char *name;
> + struct dsa_port *cpu_dp;
> struct net_device *netdev;
> struct device_node *dn;
> unsigned int ageing_time;
> diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
> index 5c510f4ba0ce..7c2326f3b538 100644
> --- a/net/dsa/dsa_priv.h
> +++ b/net/dsa/dsa_priv.h
> @@ -185,7 +185,7 @@ extern const struct dsa_device_ops trailer_netdev_ops;
>
> static inline struct net_device *dsa_master_netdev(struct dsa_slave_priv *p)
> {
> - return p->dp->ds->dst->cpu_dp->netdev;
> + return p->dp->cpu_dp->netdev;
> }
>
> #endif
> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
> index ea4ed0285922..de1ab41cfd38 100644
> --- a/net/dsa/slave.c
> +++ b/net/dsa/slave.c
> @@ -1139,9 +1139,11 @@ int dsa_slave_create(struct dsa_switch *ds, struct
> device *parent,
> struct net_device *master;
> struct net_device *slave_dev;
> struct dsa_slave_priv *p;
> + struct dsa_port *cpu_dp;
> int ret;
>
> - master = ds->dst->cpu_dp->netdev;
> + cpu_dp = ds->dst->cpu_dp;
> + master = cpu_dp->netdev;
You may assign them when declaring them, but no big deal.
>
> slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name,
> NET_NAME_UNKNOWN, ether_setup);
> @@ -1176,6 +1178,7 @@ int dsa_slave_create(struct dsa_switch *ds, struct
> device *parent,
> p->old_duplex = -1;
>
> ds->ports[port].netdev = slave_dev;
> + p->dp->cpu_dp = cpu_dp;
> ret = register_netdev(slave_dev);
> if (ret) {
> netdev_err(master, "error %d registering interface %s\n",
Reviewed-by: Vivien Didelot <vivien.dide...@savoirfairelinux.com>
