From: David S. Miller Date: Mon, 28 Aug 2017 22:20:25 +0000 (-0700) Subject: Merge branch 'nfp-flow-dissector-layer' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c73c8a8e0726710f397f8ddce21ef9897e6693e2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'nfp-flow-dissector-layer' Pieter Jansen van Vuuren says: ==================== nfp: fix layer calculation and flow dissector use Previously when calculating the supported key layers MPLS, IPv4/6 TTL and TOS were not considered. Formerly flow dissectors were referenced without first checking that they are in use and correctly populated by TC. Additionally this patch set fixes the incorrect use of mask field for vlan matching. ==================== Signed-off-by: David S. Miller --- c73c8a8e0726710f397f8ddce21ef9897e6693e2