In some scenarios a tagger must know which VLAN to assign to a packet,
even if the packet is set to egress untagged. Since the VLAN
information in the skb will be removed by the bridge in this case,
track each port's PVID such that the VID of an outgoing frame can
always be determined.
Signed-off-by: Tobias Waldekranz <tobias@xxxxxxxxxxxxxx>
---
include/net/dsa.h | 1 +
net/dsa/port.c | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 507082959aa4..1f9ba9889034 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -270,6 +270,7 @@ struct dsa_port {
unsigned int ageing_time;
bool vlan_filtering;
u8 stp_state;
+ u16 pvid;
struct net_device *bridge_dev;
struct devlink_port devlink_port;
bool devlink_port_setup;
diff --git a/net/dsa/port.c b/net/dsa/port.c
index 6379d66a6bb3..02d96aebfcc6 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -651,8 +651,14 @@ int dsa_port_vlan_add(struct dsa_port *dp,
.vlan = vlan,
.extack = extack,
};
+ int err;
+
+ err = dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
- return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
+ if (!err && (vlan->flags & BRIDGE_VLAN_INFO_PVID))
+ dp->pvid = vlan->vid;
+
+ return err;
}
int dsa_port_vlan_del(struct dsa_port *dp,
@@ -663,8 +669,14 @@ int dsa_port_vlan_del(struct dsa_port *dp,
.port = dp->index,
.vlan = vlan,
};
+ int err;
+
+ err = dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
- return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
+ if (!err && vlan->vid == dp->pvid)
+ dp->pvid = 0;
+
+ return err;
}
int dsa_port_mrp_add(const struct dsa_port *dp,
--
2.25.1
