Skip to contentSkip to conversation

net: dsa: bcm_sf2: Utilize b53_get_tag_protocol()

PATCH Applied Florian Fainelli 2 participants 2 messages Nov 30, 2017

Subsystems (4)
Networking Network drivers Networking DSA Broadcom B53/SF2 Ethernet switch driver
lore
Share & tools
lore

Florian Fainelli

author
#0 lore raw

PATCH 1/1 net: dsa: bcm_sf2: Utilize b53_get_tag_protocol()

Utilize the much more capable b53_get_tag_protocol() which takes care of all Broadcom switches specifics to resolve which port can have Broadcom tags enabled or not.

Signed-off-by Florian Fainelli <[email protected]>
---
 drivers/net/dsa/b53/b53_common.c | 4 ++--
 drivers/net/dsa/b53/b53_priv.h   | 1 +
 drivers/net/dsa/bcm_sf2.c        | 8 +-------
 3 files changed, 4 insertions(+), 9 deletions(-)
drivers/net/dsa/b53/b53_common.c +2 -2
index f5a8dd96fd75..7f26f5dafca7 100644
@@ -1495,8 +1495,7 @@ static bool b53_can_enable_brcm_tags(struct dsa_switch *ds, int port)
 	return false;
 }
 
-static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds,
-						  int port)
+enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port)
 {
 	struct b53_device *dev = ds->priv;
 

@@ -1514,6 +1513,7 @@ static enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds,
 
 	return DSA_TAG_PROTO_BRCM;
 }
+EXPORT_SYMBOL(b53_get_tag_protocol);
 
 int b53_mirror_add(struct dsa_switch *ds, int port,
 		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress)
drivers/net/dsa/b53/b53_priv.h +1 -0
index daaaa1ecb996..2af0155efce2 100644
@@ -310,6 +310,7 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
 		 dsa_fdb_dump_cb_t *cb, void *data);
 int b53_mirror_add(struct dsa_switch *ds, int port,
 		   struct dsa_mall_mirror_tc_entry *mirror, bool ingress);
+enum dsa_tag_protocol b53_get_tag_protocol(struct dsa_switch *ds, int port);
 void b53_mirror_del(struct dsa_switch *ds, int port,
 		    struct dsa_mall_mirror_tc_entry *mirror);
 int b53_enable_port(struct dsa_switch *ds, int port, struct phy_device *phy);
drivers/net/dsa/bcm_sf2.c +1 -7
index ea01f24f15e7..a640b220b19b 100644
@@ -35,12 +35,6 @@
 #include "b53/b53_priv.h"
 #include "b53/b53_regs.h"
 
-static enum dsa_tag_protocol bcm_sf2_sw_get_tag_protocol(struct dsa_switch *ds,
-							 int port)
-{
-	return DSA_TAG_PROTO_BRCM;
-}
-
 static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
 {
 	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

@@ -861,7 +855,7 @@ static const struct b53_io_ops bcm_sf2_io_ops = {
 };
 
 static const struct dsa_switch_ops bcm_sf2_ops = {
-	.get_tag_protocol	= bcm_sf2_sw_get_tag_protocol,
+	.get_tag_protocol	= b53_get_tag_protocol,
 	.setup			= bcm_sf2_sw_setup,
 	.get_strings		= b53_get_strings,
 	.get_ethtool_stats	= b53_get_ethtool_stats,
Signature · 1 line
2.14.3
maintainer Applied
#1 lore raw

From: Florian Fainelli <[email protected]>
Date: Thu, 30 Nov 2017 09:55:35 -0800

Quoted 5 lines

Utilize the much more capable b53_get_tag_protocol() which takes care of all Broadcom switches specifics to resolve which port can have Broadcom tags enabled or not.

Signed-off-by Florian Fainelli <[email protected]>

Applied, thanks Florian.