net: dsa: tag_8021q: rename dsa_8021q_bridge_tx_fwd_offload_vid

The dsa_8021q_bridge_tx_fwd_offload_vid is no longer used just for
bridge TX forwarding offload, it is the private VLAN reserved for
VLAN-unaware bridging in a way that is compatible with FDB isolation.

So just rename it dsa_tag_8021q_bridge_vid.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_vl.c b/drivers/net/dsa/sja1105/sja1105_vl.c
index 1eef60207c6ba284f69a2049a42465ec386d9637..b7e95d60a6e4534500d507504f59c4d8aa9b51d1 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_vl.c
+++ b/drivers/net/dsa/sja1105/sja1105_vl.c
@@ -306,7 +306,7 @@ static u16 sja1105_port_get_tag_8021q_vid(struct dsa_port *dp)
 
        bridge_num = dsa_port_bridge_num_get(dp);
 
-       return dsa_8021q_bridge_tx_fwd_offload_vid(bridge_num);
+       return dsa_tag_8021q_bridge_vid(bridge_num);
 }
 
 static int sja1105_init_virtual_links(struct sja1105_private *priv,

diff --git a/include/linux/dsa/8021q.h b/include/linux/dsa/8021q.h
index b4e2862633f669bb253ef39e00956b4c38161082..3ed117e299ec84f8b994dde607899a54c879963c 100644 (file)
--- a/include/linux/dsa/8021q.h
+++ b/include/linux/dsa/8021q.h
@@ -47,7 +47,7 @@ void dsa_8021q_rcv(struct sk_buff *skb, int *source_port, int *switch_id,
 struct net_device *dsa_tag_8021q_find_port_by_vbid(struct net_device *master,
                                                   int vbid);
 
-u16 dsa_8021q_bridge_tx_fwd_offload_vid(unsigned int bridge_num);
+u16 dsa_tag_8021q_bridge_vid(unsigned int bridge_num);
 
 u16 dsa_tag_8021q_standalone_vid(const struct dsa_port *dp);
 

diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index eac43f5b4e0787fb135d8d5a272448100cb8d218..a786569203f05111e338fc614545bdcb4c608a96 100644 (file)
--- a/net/dsa/tag_8021q.c
+++ b/net/dsa/tag_8021q.c
@@ -62,14 +62,14 @@
 #define DSA_8021Q_PORT(x)              (((x) << DSA_8021Q_PORT_SHIFT) & \
                                                 DSA_8021Q_PORT_MASK)
 
-u16 dsa_8021q_bridge_tx_fwd_offload_vid(unsigned int bridge_num)
+u16 dsa_tag_8021q_bridge_vid(unsigned int bridge_num)
 {
        /* The VBID value of 0 is reserved for precise TX, but it is also
         * reserved/invalid for the bridge_num, so all is well.
         */
        return DSA_8021Q_RSV | DSA_8021Q_VBID(bridge_num);
 }
-EXPORT_SYMBOL_GPL(dsa_8021q_bridge_tx_fwd_offload_vid);
+EXPORT_SYMBOL_GPL(dsa_tag_8021q_bridge_vid);
 
 /* Returns the VID that will be installed as pvid for this switch port, sent as
  * tagged egress towards the CPU port and decoded by the rcv function.
@@ -289,7 +289,7 @@ int dsa_tag_8021q_bridge_join(struct dsa_switch *ds, int port,
         * bridging VLAN
         */
        standalone_vid = dsa_tag_8021q_standalone_vid(dp);
-       bridge_vid = dsa_8021q_bridge_tx_fwd_offload_vid(bridge.num);
+       bridge_vid = dsa_tag_8021q_bridge_vid(bridge.num);
 
        err = dsa_port_tag_8021q_vlan_add(dp, bridge_vid, true);
        if (err)
@@ -312,7 +312,7 @@ void dsa_tag_8021q_bridge_leave(struct dsa_switch *ds, int port,
         * standalone VLAN
         */
        standalone_vid = dsa_tag_8021q_standalone_vid(dp);
-       bridge_vid = dsa_8021q_bridge_tx_fwd_offload_vid(bridge.num);
+       bridge_vid = dsa_tag_8021q_bridge_vid(bridge.num);
 
        err = dsa_port_tag_8021q_vlan_add(dp, standalone_vid, false);
        if (err) {

diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index f3832ac54098e42bff90c5f1d73f94ab90d89c16..83e4136516b0203b92f8ee6f1f5b044487e3a48b 100644 (file)
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -226,7 +226,7 @@ static struct sk_buff *sja1105_imprecise_xmit(struct sk_buff *skb,
         * TX VLAN that targets the bridge's entire broadcast domain,
         * instead of just the specific port.
         */
-       tx_vid = dsa_8021q_bridge_tx_fwd_offload_vid(bridge_num);
+       tx_vid = dsa_tag_8021q_bridge_vid(bridge_num);
 
        return dsa_8021q_xmit(skb, netdev, sja1105_xmit_tpid(dp), tx_vid);
 }