Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1943563d authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: setup master ethtool after dsa_ptr 



DSA overrides the master's ethtool ops so that we can inject its CPU
port's statistics. Because of that, we need to setup the ethtool ops
after the master's dsa_ptr pointer has been assigned, not before.

This patch setups the ethtool ops after dsa_ptr is assigned, and
restores them before it gets cleared.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd8d7dd4

net/dsa/dsa2.c

+7 −5
Original line number Diff line number Diff line
@@ -433,16 +433,17 @@ static int dsa_dst_apply(struct dsa_switch_tree *dst) 
			return err;

	}



	err = dsa_cpu_port_ethtool_setup(dst->cpu_dp);

	if (err)

		return err;



	/* If we use a tagging format that doesn't have an ethertype

	 * field, make sure that all packets from this point on get

	 * sent to the tag format's receive function.

	 */

	wmb();

	dst->cpu_dp->netdev->dsa_ptr = dst;



	err = dsa_cpu_port_ethtool_setup(dst->cpu_dp);

	if (err)

		return err;



	dst->applied = true;



	return 0;
@@ -456,6 +457,8 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) 
	if (!dst->applied)

		return;



	dsa_cpu_port_ethtool_restore(dst->cpu_dp);



	dst->cpu_dp->netdev->dsa_ptr = NULL;



	/* If we used a tagging format that doesn't have an ethertype
@@ -472,7 +475,6 @@ static void dsa_dst_unapply(struct dsa_switch_tree *dst) 
		dsa_ds_unapply(dst, ds);

	}



	dsa_cpu_port_ethtool_restore(dst->cpu_dp);

	dst->cpu_dp = NULL;



	pr_info("DSA: tree %d unapplied\n", dst->tree);

net/dsa/legacy.c

+3 −7
Original line number Diff line number Diff line
@@ -206,10 +206,6 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
		netdev_err(master, "[%d] : can't configure CPU and DSA ports\n",

			   index);



	ret = dsa_cpu_port_ethtool_setup(ds->dst->cpu_dp);

	if (ret)

		return ret;



	return 0;

}
@@ -606,7 +602,7 @@ static int dsa_setup_dst(struct dsa_switch_tree *dst, struct net_device *dev, 
	wmb();

	dev->dsa_ptr = dst;



	return 0;

	return dsa_cpu_port_ethtool_setup(dst->cpu_dp);

}



static int dsa_probe(struct platform_device *pdev)
@@ -671,6 +667,8 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) 
{

	int i;



	dsa_cpu_port_ethtool_restore(dst->cpu_dp);



	dst->cpu_dp->netdev->dsa_ptr = NULL;



	/* If we used a tagging format that doesn't have an ethertype
@@ -686,8 +684,6 @@ static void dsa_remove_dst(struct dsa_switch_tree *dst) 
			dsa_switch_destroy(ds);

	}



	dsa_cpu_port_ethtool_restore(dst->cpu_dp);



	dev_put(dst->cpu_dp->netdev);

}