From: David S. Miller Date: Wed, 12 Sep 2018 20:18:30 +0000 (-0700) Subject: Merge branch 'nfp-flower-fixes' X-Git-Tag: v4.19-rc4~33^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4851bfd64d42d9fb6d2d30a41c8523614b412a7a;p=uclinux-h8%2Flinux.git Merge branch 'nfp-flower-fixes' Jakub Kicinski says: ==================== nfp: flower: fixes for flower offload Two fixes for flower matching and tunnel encap. Pieter fixes VLAN matching if the entire VLAN id is masked out and match is only performed on the PCP field. Louis adds validation of tunnel flags for encap, most importantly we should not offload actions on IPv6 tunnels if it's not supported. ==================== Signed-off-by: David S. Miller --- 4851bfd64d42d9fb6d2d30a41c8523614b412a7a