]> git.ipfire.org Git - thirdparty/nftables.git/commit
proto: replace vlan ether type with 8021q
authorFlorian Westphal <fw@strlen.de>
Fri, 2 Apr 2021 10:54:53 +0000 (12:54 +0200)
committerFlorian Westphal <fw@strlen.de>
Sat, 3 Apr 2021 11:55:53 +0000 (13:55 +0200)
commit751336b7bffea4065bcd9f895eef3159addaba3e
tree841cccb108c75c53427cd84fb30c8ce3da3d2116
parente9e4c3c9092fdb447f13573f176b1c337f8efc4f
proto: replace vlan ether type with 8021q

Previous patches added "8021ad" mnemonic for IEEE 802.1AD frame type.
This adds the 8021q shorthand for the existing 'vlan' frame type.

nft will continue to recognize 'ether type vlan', but listing
will now print 8021q.

Adjust all test cases accordingly.

Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
17 files changed:
src/proto.c
src/scanner.l
tests/py/any/meta.t
tests/py/any/meta.t.json
tests/py/any/meta.t.json.output
tests/py/any/meta.t.payload
tests/py/bridge/meta.t
tests/py/bridge/meta.t.json
tests/py/bridge/reject.t
tests/py/bridge/reject.t.json
tests/py/bridge/reject.t.json.output
tests/py/bridge/reject.t.payload
tests/py/bridge/vlan.t
tests/py/bridge/vlan.t.json
tests/py/bridge/vlan.t.json.output
tests/py/bridge/vlan.t.payload
tests/py/bridge/vlan.t.payload.netdev