diff options
| author | David S. Miller <davem@davemloft.net> | 2021-08-25 13:14:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-08-25 13:14:34 +0300 |
| commit | 6956fa394a474404d76f4c0584c70bcaefa7659e (patch) | |
| tree | 074b602fa93e2dbeff8d3bb9fd215a3e0218baaa /include | |
| parent | 1ca8a193cade7f49801cc79e20d5f2a123991cdf (diff) | |
| parent | 8ded9160928e545c2e694b77a87263fa078ff4c6 (diff) | |
| download | linux-6956fa394a474404d76f4c0584c70bcaefa7659e.tar.xz | |
Merge branch 'dsa-sja1105-vlan-tags'
Vladimir Oltean says:
====================
Make sja1105 treat tag_8021q VLANs more like real DSA tags
This series solves a nuisance with the sja1105 driver, which is that
non-DSA tagged packets sent directly by the DSA master would still exit
the switch just fine.
We also had an issue for packets coming from the outside world with a
crafted DSA tag, the switch would not reject that tag but think it was
valid.
====================
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dsa/sja1105.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h index 6b0dc9ff92d1..171106202fe5 100644 --- a/include/linux/dsa/sja1105.h +++ b/include/linux/dsa/sja1105.h @@ -16,6 +16,8 @@ #define ETH_P_SJA1105_META 0x0008 #define ETH_P_SJA1110 0xdadc +#define SJA1105_DEFAULT_VLAN (VLAN_N_VID - 1) + /* IEEE 802.3 Annex 57A: Slow Protocols PDUs (01:80:C2:xx:xx:xx) */ #define SJA1105_LINKLOCAL_FILTER_A 0x0180C2000000ull #define SJA1105_LINKLOCAL_FILTER_A_MASK 0xFFFFFF000000ull @@ -65,7 +67,6 @@ struct sja1105_port { struct sja1105_tagger_data *data; struct dsa_port *dp; bool hwts_tx_en; - u16 xmit_tpid; }; enum sja1110_meta_tstamp { |