Merge branch 'qlcnic'
authorDavid S. Miller <davem@davemloft.net>
Tue, 17 Dec 2013 22:09:49 +0000 (17:09 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Dec 2013 22:09:49 +0000 (17:09 -0500)
commit5c509a2edf386a98fea37d49a06abd4da9e227ea
treed0907ac89d292354e00ef257c03600f3d065f5a3
parentbaf9573e6794a979ba1b9bb8a1221c56ceb1bc79
parentc100bb2270588b614f7e6ae39a579a1aeb21bf03
Merge branch 'qlcnic'

Manish Chopra says:

====================
qlcnic: Refactoring and enhancements

This patch series includes follwing changes

* Refactor DCBX code. Do not allow DCBX operations for VFs
* Issue INIT_NIC mailbox command only once
* Refactor initialize nic code path
* Allow configuration for single TX/RX queue
* VLAN enhancement for 84xx adapters
* Support for 16 virtual NIC functions for 84XX series adapters

Please apply to net-next
====================

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