net: dsa: change tag_protocol to an enum

Now that we introduced an additional multiplexing/demultiplexing layer
with commit 3e8a72d1dae37 ("net: dsa: reduce number of protocol hooks")
that lives within the DSA code, we no longer need to have a given switch
driver tag_protocol be an actual ethertype value, instead, we can
replace it with an enum: dsa_tag_protocol.

Do this replacement in the drivers, which allows us to get rid of the
cpu_to_be16()/htons() dance, and remove ETH_P_BRCMTAG since we do not
need it anymore.

Suggested-by: Alexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 5 deletions

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 7333a4aebb7d..809eeb13eb12 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -437,22 +437,22 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
 
         switch (ds->dst->tag_protocol) {
 #ifdef CONFIG_NET_DSA_TAG_DSA
-        case htons(ETH_P_DSA):
+        case DSA_TAG_PROTO_DSA:
                 ds->dst->ops = &dsa_netdev_ops;
                 break;
 #endif
 #ifdef CONFIG_NET_DSA_TAG_EDSA
-        case htons(ETH_P_EDSA):
+        case DSA_TAG_PROTO_EDSA:
                 ds->dst->ops = &edsa_netdev_ops;
                 break;
 #endif
 #ifdef CONFIG_NET_DSA_TAG_TRAILER
-        case htons(ETH_P_TRAILER):
+        case DSA_TAG_PROTO_TRAILER:
                 ds->dst->ops = &trailer_netdev_ops;
                 break;
 #endif
 #ifdef CONFIG_NET_DSA_TAG_BRCM
-        case htons(ETH_P_BRCMTAG):
+        case DSA_TAG_PROTO_BRCM:
                 ds->dst->ops = &brcm_netdev_ops;
                 break;
 #endif
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index e0b759ec209e..8fbc21c0de78 100644
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -91,7 +91,6 @@ static netdev_tx_t brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev)
         /* Queue the SKB for transmission on the parent interface, but
          * do not modify its EtherType
          */
-        skb->protocol = htons(ETH_P_BRCMTAG);
         skb->dev = p->parent->dst->master_netdev;
         dev_queue_xmit(skb);