From: David S. Miller Date: Mon, 4 Jul 2022 09:44:08 +0000 (+0100) Subject: Merge branch 'nfp-vlan-strip-and-insert' X-Git-Tag: v6.0-rc1~141^2~205 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd4b96c44aba86c4bacda2a93f57429ffd835284;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'nfp-vlan-strip-and-insert' Simon Horman says: ==================== nfp: support VLAN strip and insert this series adds support to the NFP driver for HW offload of both: * RX VLAN ctag/stag strip * TX VLAN ctag insert ==================== Signed-off-by: David S. Miller --- fd4b96c44aba86c4bacda2a93f57429ffd835284