2017-08-02 19:51:46

by Vivien Didelot

Subject: [PATCH net-next] net: dsa: bcm_sf2: dst in not an array

It's been a while now since ds->dst is not an array anymore, but a
simple pointer to a dsa_switch_tree.

Fortunately, SF2 does not support multi-chip and thus ds->index is
always 0.

This patch substitutes 'ds->dst[ds->index].' with 'ds->dst->'.

Signed-off-by: Vivien Didelot <[email protected]>
---
drivers/net/dsa/bcm_sf2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 6bbfa6ea1efb..558667c814c9 100644
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -788,7 +788,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)
static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,
struct ethtool_wolinfo *wol)
{
- struct net_device *p = ds->dst[ds->index].cpu_dp->netdev;
+ struct net_device *p = ds->dst->cpu_dp->netdev;
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
struct ethtool_wolinfo pwol;

@@ -811,7 +811,7 @@ static void bcm_sf2_sw_get_wol(struct dsa_switch *ds, int port,
static int bcm_sf2_sw_set_wol(struct dsa_switch *ds, int port,
struct ethtool_wolinfo *wol)
{
- struct net_device *p = ds->dst[ds->index].cpu_dp->netdev;
+ struct net_device *p = ds->dst->cpu_dp->netdev;
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
s8 cpu_port = ds->dst->cpu_dp->index;
struct ethtool_wolinfo pwol;
--
2.13.3

2017-08-02 19:55:17

by Florian Fainelli

Subject: Re: [PATCH net-next] net: dsa: bcm_sf2: dst in not an array

On 08/02/2017 12:48 PM, Vivien Didelot wrote:
> It's been a while now since ds->dst is not an array anymore, but a
> simple pointer to a dsa_switch_tree.
>
> Fortunately, SF2 does not support multi-chip and thus ds->index is
> always 0.
>
> This patch substitutes 'ds->dst[ds->index].' with 'ds->dst->'.
>
> Signed-off-by: Vivien Didelot <[email protected]>

Reviewed-by: Florian Fainelli <[email protected]>

Thanks!
--
Florian

2017-08-03 16:30:29

by David Miller

Subject: Re: [PATCH net-next] net: dsa: bcm_sf2: dst in not an array

From: Vivien Didelot <[email protected]>
Date: Wed, 2 Aug 2017 15:48:25 -0400

> It's been a while now since ds->dst is not an array anymore, but a
> simple pointer to a dsa_switch_tree.
>
> Fortunately, SF2 does not support multi-chip and thus ds->index is
> always 0.
>
> This patch substitutes 'ds->dst[ds->index].' with 'ds->dst->'.
>
> Signed-off-by: Vivien Didelot <[email protected]>

Applied.