From: David S. Miller <davem@davemloft.net>
Date: Tue, 25 Feb 2014 23:32:45 +0000 (-0500)
Subject: Merge branch 'qlcnic'
X-Git-Tag: firefly_0821_release~176^2~4330^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e88570f80317f074cbfaa4b7ed3f3d1e066787f3;p=firefly-linux-kernel-4.4.55.git

Merge branch 'qlcnic'

Shahed Shaikh says:

====================
qlcnic: Bug fixes

This patch series includes following bug fixes,

* Fix for return value handling of function qlcnic_enable_msi_legacy().
* Fix for the usage of module parameters for interrupt mode.
  Driver should use flags while checking for driver's interrupt mode instead of
  module parameters.
* Revert commit 1414abea04 (qlcnic: Restrict VF from configuring any VLAN mode),
  in order to save some multicast filters.
* Fix a bug where driver was not re-setting sds ring count to 1 when
  it falls back from MSI-x mode to legacy interrupt mode.

Please apply to net.

Change in v2 -
Dropped patch "qlcnic: reset firmware API lock during driver load" for further rework.
====================

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

e88570f80317f074cbfaa4b7ed3f3d1e066787f3