Merge branch 'nfp-flow-dissector-layer'
authorDavid S. Miller <davem@davemloft.net>
Mon, 28 Aug 2017 22:20:25 +0000 (15:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Aug 2017 22:20:25 +0000 (15:20 -0700)
commitc73c8a8e0726710f397f8ddce21ef9897e6693e2
tree96f56a13c4ccbe37a3e073b5d5896ce9e7ea5ae5
parent77146b5d79cfa51aebb8c0e8c19af32b579890f7
parent6afd33e4384060e692705912337b184c1e159aff
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 <davem@davemloft.net>