summaryrefslogtreecommitdiff
path: root/net/dsa
diff options
context:
space:
mode:
authorVladimir Oltean <vladimir.oltean@nxp.com>2022-02-25 12:22:21 +0300
committerDavid S. Miller <davem@davemloft.net>2022-02-27 14:06:14 +0300
commitb6362bdf750b4ba266d4a10156174ec52460e73d (patch)
tree62290a9e34156c70a0bf96dc6f8771e4184caa5f /net/dsa
parent04b67e18ce5b29785578397f6785f28f512d64aa (diff)
downloadlinux-b6362bdf750b4ba266d4a10156174ec52460e73d.tar.xz
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>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/tag_8021q.c8
-rw-r--r--net/dsa/tag_sja1105.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/net/dsa/tag_8021q.c b/net/dsa/tag_8021q.c
index eac43f5b4e07..a786569203f0 100644
--- 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 f3832ac54098..83e4136516b0 100644
--- 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);
}