Fix VLAN checks for SJA1105 DSA tc-flower filters
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 1 replyIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | net: dsa: sja1105: remove debugging code in sja1105_vl_gatedrivers/ | +0 | 0 replies | |
| 2/3 | net: dsa: sja1105: fix checks for VLAN state in redirect actiondrivers/ | +3 | 0 replies | |
| 3/3 | net: dsa: sja1105: fix checks for VLAN state in gate actiondrivers/ | +3 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH net 0/3] Fix VLAN checks for SJA1105 DSA tc-flower filters
From: Vladimir Oltean <[email protected]>
This fixes a ridiculous situation where the driver, in VLAN-unaware mode, would refuse accepting any tc filter:
tc filter replace dev sw1p3 ingress flower skip_sw \
dst_mac 42:be:24:9b:76:20 \ action gate (...)
Error: sja1105: Can only gate based on {DMAC, VID, PCP}.
tc filter replace dev sw1p3 ingress protocol 802.1Q flower skip_sw \
vlan_id 1 vlan_prio 0 dst_mac 42:be:24:9b:76:20 \ action gate (...)
Error: sja1105: Can only gate based on DMAC.
So, without changing the VLAN awareness state, it says it doesn't want VLAN-aware rules, and it doesn't want VLAN-unaware rules either. One would say it's in Schrodinger's state...
Now, the situation has been made worse by commit 7f14937facdc ("net:
dsa: sja1105: keep the VLAN awareness state in a driver variable"), which made VLAN awareness a ternary attribute, but after inspecting the code from before that patch with a truth table, it looks like the logical bug was there even before.
While attempting to fix this, I also noticed some leftover debugging code in one of the places that needed to be fixed. It would have appeared in the context of patch 3/3 anyway, so I decided to create a patch that removes it.
Vladimir Oltean (3):
net: dsa: sja1105: remove debugging code in sja1105_vl_gate
net: dsa: sja1105: fix checks for VLAN state in redirect action
net: dsa: sja1105: fix checks for VLAN state in gate action
drivers/net/dsa/sja1105/sja1105_vl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
Signature · 1 line
2.25.1