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

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

net: dsa: remove tag ops from the switch tree 



Now that the dsa_ptr is a dsa_port instance, there is no need to keep
the tag operations in the dsa_switch_tree structure. Remove it.

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 2f657a60

include/net/dsa.h

+0 −11
Original line number Diff line number Diff line
@@ -130,11 +130,6 @@ struct dsa_switch_tree { 
	 */

	struct dsa_platform_data	*pd;



	/* Copy of tag_ops->rcv for faster access in hot path */

	struct sk_buff *	(*rcv)(struct sk_buff *skb,

				       struct net_device *dev,

				       struct packet_type *pt);



	/*

	 * The switch port to which the CPU is attached.

	 */
@@ -144,12 +139,6 @@ struct dsa_switch_tree { 
	 * Data for the individual switch chips.

	 */

	struct dsa_switch	*ds[DSA_MAX_SWITCHES];



	/*

	 * Tagging protocol operations for adding and removing an

	 * encapsulation tag.

	 */

	const struct dsa_device_ops *tag_ops;

};



/* TC matchall action types, only mirroring for now */

net/dsa/dsa2.c

+0 −2
Original line number Diff line number Diff line
@@ -523,11 +523,9 @@ static int dsa_cpu_parse(struct dsa_port *port, u32 index, 
	}



	dst->cpu_dp->tag_ops = tag_ops;

	dst->tag_ops = tag_ops;



	/* Make a few copies for faster access in master receive hot path */

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

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

	dst->cpu_dp->dst = dst;



	return 0;

net/dsa/legacy.c

+0 −2
Original line number Diff line number Diff line
@@ -153,11 +153,9 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, 
			return PTR_ERR(tag_ops);



		dst->cpu_dp->tag_ops = tag_ops;

		dst->tag_ops = tag_ops;



		/* Few copies for faster access in master receive hot path */

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

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

		dst->cpu_dp->dst = dst;

	}