Skip to content

net: dsa: lantiq_gswip: clean up and improve VLAN handling

Daniel Golle lkml netdev 1 version Applied

Status from this message: This series was applied to netdev/net-next.git (main)

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest11 patches 0 repliesApplied 11/11

Patches in v1 All 11 applied

#Subject and filesSizeRepliesApplied
1/11net: dsa: lantiq_gswip: support bridge FDB entries on the CPU portdrivers/net/dsa/lantiq/lantiq_gswip.c+10 -80 repliesApplied
2/11net: dsa: lantiq_gswip: define VLAN ID 0 constantdrivers/net/dsa/lantiq/lantiq_gswip.c drivers/net/dsa/lantiq/lantiq_gswip.h+9 -50 repliesApplied
3/11net: dsa: lantiq_gswip: remove duplicate assignment to vlan_mapping.val[0]drivers/net/dsa/lantiq/lantiq_gswip.c+1 -20 repliesApplied
4/11net: dsa: lantiq_gswip: merge gswip_vlan_add_unaware() and gswip_vlan_add_aware()drivers/net/dsa/lantiq/lantiq_gswip.c+17 -770 repliesApplied
5/11net: dsa: lantiq_gswip: remove legacy configure_vlan_while_not_filtering optiondrivers/net/dsa/lantiq/lantiq_gswip.c+43 -60 repliesApplied
6/11net: dsa: lantiq_gswip: permit dynamic changes to VLAN filtering statedrivers/net/dsa/lantiq/lantiq_gswip.c drivers/net/dsa/lantiq/lantiq_gswip.h+12 -270 repliesApplied
7/11net: dsa: lantiq_gswip: disallow changes to privately set up VID 0drivers/net/dsa/lantiq/lantiq_gswip.c+6 -00 repliesApplied
8/11net: dsa: lantiq_gswip: remove vlan_aware and pvid arguments from gswip_vlan_remove()drivers/net/dsa/lantiq/lantiq_gswip.c+4 -50 repliesApplied
9/11net: dsa: lantiq_gswip: put a more descriptive error print in gswip_vlan_remove()drivers/net/dsa/lantiq/lantiq_gswip.c+2 -10 repliesApplied
10/11net: dsa: lantiq_gswip: drop untagged on VLAN-aware bridge ports with no PVIDdrivers/net/dsa/lantiq/lantiq_gswip.c drivers/net/dsa/lantiq/lantiq_gswip.h+10 -00 repliesApplied
11/11net: dsa: lantiq_gswip: treat VID 0 like the PVIDdrivers/net/dsa/lantiq/lantiq_gswip.c+2 -20 repliesApplied

Reviews trailers per patch

None of the 11 patches has a Reviewed-by or Acked-by.

PatchDaniel Golle
1/11
2/11
3/11
4/11
5/11T-b
6/11
7/11
8/11
9/11
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH net-next 00/11] net: dsa: lantiq_gswip: clean up and improve VLAN handling

Hi all,

This series was developed by Vladimir Oltean to improve and clean up the VLAN handling logic in the Lantiq GSWIP DSA driver.

As Vladimir currently doesn't have the availability to take care of the submission process, we agreed that I would send the patches on his behalf.

The series focuses on consolidating the VLAN management paths for both VLAN-unaware and VLAN-aware bridges, simplifying internal logic, and removing legacy or redundant code. It also fixes a number of subtle inconsistencies regarding VLAN ID 0 handling, bridge FDB entries, and brings the driver into shape to permit dynamic changes to the VLAN filtering state.

Notable changes include:

- Support for bridge FDB entries on the CPU port

- Consolidation of gswip_vlan_add_unaware() and gswip_vlan_add_aware() into a unified implementation

- Removal of legacy VLAN configuration options and redundant assignments

- Improved handling of VLAN ID 0 and PVID behavior

- Better validation and error reporting in VLAN removal paths

- Support for dynamic VLAN filtering configuration changes

Overall, this refactor improves readability and maintainability of the Lantiq GSWIP DSA driver. It also results in all local-termination.sh tests now passing, and slightly improves the results of bridge-vlan-{un,}aware.sh.

All patches have been authored by Vladimir Oltean; a small unintended functional change in patch "net: dsa: lantiq_gswip: merge gswip_vlan_add_unaware() and gswip_vlan_add_aware()" has been ironed out and some of the commit descriptions were improved by me, apart from that I'm only handling the submission and will help with follow-up discussions or review feedback as needed.

Despite the fact that some changes here do actually fix things (in the sense that selftests which would previously FAIL now PASS) we decided that it would be the best for this series of patches to go via net-next. If requested some of it can still be ported to stable kernels later on.

Vladimir Oltean (11):
net: dsa: lantiq_gswip: support bridge FDB entries on the CPU port
net: dsa: lantiq_gswip: define VLAN ID 0 constant
net: dsa: lantiq_gswip: remove duplicate assignment to

    vlan_mapping.val[0]

net: dsa: lantiq_gswip: merge gswip_vlan_add_unaware() and
gswip_vlan_add_aware()
net: dsa: lantiq_gswip: remove legacy
configure_vlan_while_not_filtering option
net: dsa: lantiq_gswip: permit dynamic changes to VLAN filtering state
net: dsa: lantiq_gswip: disallow changes to privately set up VID 0
net: dsa: lantiq_gswip: remove vlan_aware and pvid arguments from
gswip_vlan_remove()
net: dsa: lantiq_gswip: put a more descriptive error print in
gswip_vlan_remove()
net: dsa: lantiq_gswip: drop untagged on VLAN-aware bridge ports with
no PVID
net: dsa: lantiq_gswip: treat VID 0 like the PVID

 drivers/net/dsa/lantiq/lantiq_gswip.c | 224 ++++++++++++--------------
 drivers/net/dsa/lantiq/lantiq_gswip.h |   7 +-
 2 files changed, 107 insertions(+), 124 deletions(-)
Signature · 1 line
2.51.0