tree caf782bddb59c729fb4b0b638c7ed6467faa3e5e
parent 28be6e07e8bccee76b51bca8fdba52c1b28fc77c
parent 60b4a1f3b3b4607be7c70cc07604a2749f5eb778
author David S. Miller <davem@davemloft.net> 1382118150 -0400
committer David S. Miller <davem@davemloft.net> 1382118150 -0400

Merge branch 'qlcnic'

Himanshu Madhani says:

====================
qlcnic: ethtool enhancements and code cleanup.

This patch series contains

o updates to ethtool for pause settings and enhance
  register dump to display mask and ring indices.
o cleanup in DCB code and remove redundant eSwitch enablement command.
o fixed firmware dump collection logic to skip unknown entries.

Changes from v3 -> v4
o Dropped patch for Tx queue validation to be submitted in net.

Changes from v2 -> v3

o Updated patch to print informational messages as per Joe Perches's comment.

Changes from v1 -> v2

o Dropped patch to register device if adapter is in FAILED state for more rework.
o Updated patch to display ring indices via ethtool per Ben Hutchings's comment.
o Update patch for DCB cleanup per Stephen Hemminger's comment.

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

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