Merge branch 'bnxt_en-fixes'
authorDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2016 23:02:04 +0000 (16:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Jun 2016 23:02:04 +0000 (16:02 -0700)
commit71743ffa15b1822d10dc6320fbc2272a086a99c2
treeaa268a311f05adf73488b005fb08a3db73d8e1cb
parentfa54cc70ed2eddd96773ffdf4d96d23ea7483e56
parent8852ddb4dcdfe6f877a02f79bf2bca9ae63c039a
Merge branch 'bnxt_en-fixes'

Michael Chan says:

====================
bnxt_en: Bug fixes.

Fix a race condition and VLAN rx acceleration logic.
====================

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