]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'nfp-flower-fix-matching-and-pushing-vlan-CFI-bit'
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Apr 2019 01:02:41 +0000 (18:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Apr 2019 01:02:41 +0000 (18:02 -0700)
commit775acf987adf72a87c51d1d035126b20eed00039
tree70cbe9db7f864f655131cac05970e45983978de3
parent3ae6ec8727f6594cefcc94655a0f42f67d81fdb9
parentaa19edee180781de27895f1fc907646182ee1fe8
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>