diff options
author | David S. Miller <davem@davemloft.net> | 2020-06-18 20:20:46 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-06-18 20:20:46 -0700 |
commit | ad103e03bda701f54dc97fbde7f199adc9e80282 (patch) | |
tree | 606c4c90925209bcf64ac77e88af250e5db97f18 /net | |
parent | b64ee4856c106fc743880c1a33074c7bcebf6eb6 (diff) | |
parent | 5182a6222dd0f27c41cda2706bdc58d48a0d8f96 (diff) | |
download | linux-ad103e03bda701f54dc97fbde7f199adc9e80282.tar.bz2 |
Merge branch 'sja1105-fixes'
Vladimir Oltean says:
====================
Fix VLAN checks for SJA1105 DSA tc-flower filters
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.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions