Merge branch 'sfc-rx-vlan-filtering'
authorDavid S. Miller <davem@davemloft.net>
Thu, 16 Jun 2016 05:26:27 +0000 (22:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Jun 2016 05:26:27 +0000 (22:26 -0700)
commitb478af0cd7957faca83779fe6832abae163f7159
tree3d58aa02d1fd51537823f9de3a89baba70851df7
parent56108c1183395bc9b82fc55f7cfe7dcbf7b795e9
parent38d27f389cf5f1973ca97ddf0fc0b4c6886001ec
Merge branch 'sfc-rx-vlan-filtering'

Edward Cree says:

====================
sfc: RX VLAN filtering

Adds support for VLAN-qualified receive filters on EF10 hardware.
This is needed when running as a guest if the hypervisor has enabled
vfs-vlan-restrict, in which case the firmware rejects filters not qualified
with VLAN 0.
====================

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