This is a backport of d1b58fc60758 ("Merge branch
'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit'") onto tag v5.0.5.Pieter Jansen van Vuuren (2): nfp: flower: replace CFI with vlan present nfp: flower: remove vlan CFI bit from push vlan action drivers/net/ethernet/netronome/nfp/flower/action.c | 3 +-- drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 3 +-- drivers/net/ethernet/netronome/nfp/flower/match.c | 14 ++++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) -- 2.21.0
