From: David S. Miller <davem@davemloft.net>
Date: Tue, 2 Apr 2019 01:02:41 +0000 (-0700)
Subject: Merge branch 'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d1b58fc607583f31c314ff41d524db5c19a5f719;p=people%2Fjulieng%2Flinux-arm.git

Merge branch 'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit'

Jakub Kicinski says:

====================
nfp: flower: fix matching and pushing vlan CFI bit

This patch clears up some confusion around the meaning of bit 12
for FW messages related to VLAN and flower offload.

Pieter says:
It fixes issues with matching, pushing and popping vlan tags.
We replace the vlan CFI bit with a vlan present bit that
indicates the presence of a vlan tag. We also no longer set
the CFI when pushing vlan tags.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

d1b58fc607583f31c314ff41d524db5c19a5f719