Commit 0b42f033 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

dsa: Add MODULE_ALIAS to taggers in preparation to become modules 



When the tag drivers become modules, we will need to dynamically load
them based on what the switch drivers need. Add aliases to map between
the TAG protocol and the driver.

In order to do this, we need the tag protocol number as something
which the C pre-processor can stringinfy. Only the compiler knows the
value of an enum, CPP cannot use them. So add #defines.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 875138f8

include/net/dsa.h

+30 −13
Original line number Diff line number Diff line
@@ -30,19 +30,32 @@ struct phy_device; 
struct fixed_phy_status;

struct phylink_link_state;



#define DSA_TAG_PROTO_NONE_VALUE		0

#define DSA_TAG_PROTO_BRCM_VALUE		1

#define DSA_TAG_PROTO_BRCM_PREPEND_VALUE	2

#define DSA_TAG_PROTO_DSA_VALUE			3

#define DSA_TAG_PROTO_EDSA_VALUE		4

#define DSA_TAG_PROTO_GSWIP_VALUE		5

#define DSA_TAG_PROTO_KSZ9477_VALUE		6

#define DSA_TAG_PROTO_KSZ9893_VALUE		7

#define DSA_TAG_PROTO_LAN9303_VALUE		8

#define DSA_TAG_PROTO_MTK_VALUE			9

#define DSA_TAG_PROTO_QCA_VALUE			10

#define DSA_TAG_PROTO_TRAILER_VALUE		11



enum dsa_tag_protocol {

	DSA_TAG_PROTO_NONE = 0,

	DSA_TAG_PROTO_BRCM,

	DSA_TAG_PROTO_BRCM_PREPEND,

	DSA_TAG_PROTO_DSA,

	DSA_TAG_PROTO_EDSA,

	DSA_TAG_PROTO_GSWIP,

	DSA_TAG_PROTO_KSZ9477,

	DSA_TAG_PROTO_KSZ9893,

	DSA_TAG_PROTO_LAN9303,

	DSA_TAG_PROTO_MTK,

	DSA_TAG_PROTO_QCA,

	DSA_TAG_PROTO_TRAILER,

	DSA_TAG_PROTO_NONE		= DSA_TAG_PROTO_NONE_VALUE,

	DSA_TAG_PROTO_BRCM		= DSA_TAG_PROTO_BRCM_VALUE,

	DSA_TAG_PROTO_BRCM_PREPEND	= DSA_TAG_PROTO_BRCM_PREPEND_VALUE,

	DSA_TAG_PROTO_DSA		= DSA_TAG_PROTO_DSA_VALUE,

	DSA_TAG_PROTO_EDSA		= DSA_TAG_PROTO_EDSA_VALUE,

	DSA_TAG_PROTO_GSWIP		= DSA_TAG_PROTO_GSWIP_VALUE,

	DSA_TAG_PROTO_KSZ9477		= DSA_TAG_PROTO_KSZ9477_VALUE,

	DSA_TAG_PROTO_KSZ9893		= DSA_TAG_PROTO_KSZ9893_VALUE,

	DSA_TAG_PROTO_LAN9303		= DSA_TAG_PROTO_LAN9303_VALUE,

	DSA_TAG_PROTO_MTK		= DSA_TAG_PROTO_MTK_VALUE,

	DSA_TAG_PROTO_QCA		= DSA_TAG_PROTO_QCA_VALUE,

	DSA_TAG_PROTO_TRAILER		= DSA_TAG_PROTO_TRAILER_VALUE,

	DSA_TAG_LAST,			/* MUST BE LAST */

};
@@ -59,6 +72,10 @@ struct dsa_device_ops { 
	const char *name;

};



#define DSA_TAG_DRIVER_ALIAS "dsa_tag-"

#define MODULE_ALIAS_DSA_TAG_DRIVER(__proto)				\

	MODULE_ALIAS(DSA_TAG_DRIVER_ALIAS __stringify(__proto##_VALUE))



struct dsa_switch_tree {

	struct list_head	list;

net/dsa/tag_brcm.c

+4 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ const struct dsa_device_ops brcm_netdev_ops = { 
	.rcv	= brcm_tag_rcv,

	.overhead = BRCM_TAG_LEN,

};



MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM);

#endif



#ifdef CONFIG_NET_DSA_TAG_BRCM_PREPEND
@@ -198,3 +200,5 @@ const struct dsa_device_ops brcm_prepend_netdev_ops = { 
	.overhead = BRCM_TAG_LEN,

};

#endif



MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_BRCM_PREPEND);

net/dsa/tag_dsa.c

+2 −0
Original line number Diff line number Diff line
@@ -157,3 +157,5 @@ const struct dsa_device_ops dsa_netdev_ops = { 
	.flow_dissect   = dsa_tag_flow_dissect,

	.overhead = DSA_HLEN,

};



MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_DSA);

net/dsa/tag_edsa.c

+2 −0
Original line number Diff line number Diff line
@@ -176,3 +176,5 @@ const struct dsa_device_ops edsa_netdev_ops = { 
	.flow_dissect   = edsa_tag_flow_dissect,

	.overhead = EDSA_HLEN,

};



MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_EDSA);

net/dsa/tag_gswip.c

+2 −0
Original line number Diff line number Diff line
@@ -109,3 +109,5 @@ const struct dsa_device_ops gswip_netdev_ops = { 
	.rcv = gswip_tag_rcv,

	.overhead = GSWIP_RX_HEADER_LEN,

};



MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_GSWIP);

CRA Git | Maintained and supported by SUSTech CRA and CCSE