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

Commit b74b70c4 authored Nov 10, 2017 by Florian Fainelli Committed by David S. Miller Nov 13, 2017

net: dsa: Support prepended Broadcom tag



Add a new type: DSA_TAG_PROTO_PREPEND which allows us to support for the
4-bytes Broadcom tag that we already support, but in a format where it
is pre-pended to the packet instead of located between the MAC SA and
the Ethertyper (DSA_TAG_PROTO_BRCM).

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f7c39e3d

include/net/dsa.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ struct fixed_phy_status;
	enum dsa_tag_protocol {		enum dsa_tag_protocol {
	DSA_TAG_PROTO_NONE = 0,		DSA_TAG_PROTO_NONE = 0,
	DSA_TAG_PROTO_BRCM,		DSA_TAG_PROTO_BRCM,
			DSA_TAG_PROTO_BRCM_PREPEND,
	DSA_TAG_PROTO_DSA,		DSA_TAG_PROTO_DSA,
	DSA_TAG_PROTO_EDSA,		DSA_TAG_PROTO_EDSA,
	DSA_TAG_PROTO_KSZ,		DSA_TAG_PROTO_KSZ,

net/dsa/Kconfig

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -19,6 +19,9 @@ if NET_DSA
	config NET_DSA_TAG_BRCM		config NET_DSA_TAG_BRCM
	bool		bool

			config NET_DSA_TAG_BRCM_PREPEND
			bool

	config NET_DSA_TAG_DSA		config NET_DSA_TAG_DSA
	bool		bool

net/dsa/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,7 @@ dsa_core-y += dsa.o dsa2.o legacy.o master.o port.o slave.o switch.o

	# tagging formats		# tagging formats
	dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o		dsa_core-$(CONFIG_NET_DSA_TAG_BRCM) += tag_brcm.o
			dsa_core-$(CONFIG_NET_DSA_TAG_BRCM_PREPEND) += tag_brcm.o
	dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o		dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
	dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o		dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
	dsa_core-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o		dsa_core-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o

net/dsa/dsa.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,9 @@ const struct dsa_device_ops *dsa_device_ops[DSA_TAG_LAST] = {
	#ifdef CONFIG_NET_DSA_TAG_BRCM		#ifdef CONFIG_NET_DSA_TAG_BRCM
	[DSA_TAG_PROTO_BRCM] = &brcm_netdev_ops,		[DSA_TAG_PROTO_BRCM] = &brcm_netdev_ops,
	#endif		#endif
			#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND
			[DSA_TAG_PROTO_BRCM_PREPEND] = &brcm_prepend_netdev_ops,
			#endif
	#ifdef CONFIG_NET_DSA_TAG_DSA		#ifdef CONFIG_NET_DSA_TAG_DSA
	[DSA_TAG_PROTO_DSA] = &dsa_netdev_ops,		[DSA_TAG_PROTO_DSA] = &dsa_netdev_ops,
	#endif		#endif

net/dsa/dsa_priv.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -191,6 +191,7 @@ void dsa_switch_unregister_notifier(struct dsa_switch *ds);

	/* tag_brcm.c */		/* tag_brcm.c */
	extern const struct dsa_device_ops brcm_netdev_ops;		extern const struct dsa_device_ops brcm_netdev_ops;
			extern const struct dsa_device_ops brcm_prepend_netdev_ops;

	/* tag_dsa.c */		/* tag_dsa.c */
	extern const struct dsa_device_ops dsa_netdev_ops;		extern const struct dsa_device_ops dsa_netdev_ops;