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

Commit 62fc9587 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: use temporary dsa_device_ops variable 



When resolving the DSA tagging protocol used by a CPU switch, use a
temporary "tag_ops" variable to store the dsa_device_ops instead of
using directly dst->tag_ops. This will make the future patches moving
this pointer around easier to read.

There is no functional changes.

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 7ec764ee

net/dsa/dsa2.c

+5 −3
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, 
			 struct dsa_switch_tree *dst,

			 struct dsa_switch *ds)

{

	const struct dsa_device_ops *tag_ops;

	enum dsa_tag_protocol tag_protocol;

	struct net_device *ethernet_dev;

	struct device_node *ethernet;
@@ -514,13 +515,14 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, 
	ds->cpu_port_mask |= BIT(index);



	tag_protocol = ds->ops->get_tag_protocol(ds);

	dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);

	if (IS_ERR(dst->tag_ops)) {

	tag_ops = dsa_resolve_tag_protocol(tag_protocol);

	if (IS_ERR(tag_ops)) {

		dev_warn(ds->dev, "No tagger for this switch\n");

		ds->cpu_port_mask &= ~BIT(index);

		return PTR_ERR(dst->tag_ops);

		return PTR_ERR(tag_ops);

	}



	dst->tag_ops = tag_ops;

	dst->rcv = dst->tag_ops->rcv;



	return 0;

net/dsa/legacy.c

+5 −3
Original line number Diff line number Diff line
@@ -144,13 +144,15 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
	 * switch.

	 */

	if (dst->cpu_dp->ds == ds) {

		const struct dsa_device_ops *tag_ops;

		enum dsa_tag_protocol tag_protocol;



		tag_protocol = ops->get_tag_protocol(ds);

		dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);

		if (IS_ERR(dst->tag_ops))

			return PTR_ERR(dst->tag_ops);

		tag_ops = dsa_resolve_tag_protocol(tag_protocol);

		if (IS_ERR(tag_ops))

			return PTR_ERR(tag_ops);



		dst->tag_ops = tag_ops;

		dst->rcv = dst->tag_ops->rcv;

	}