diff options
| author | David S. Miller <davem@davemloft.net> | 2013-08-31 22:35:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-31 22:35:26 -0400 |
| commit | ba39767288661c01ac7797b6b981f73b6513cf55 (patch) | |
| tree | 411bae7d6a3df6d43777ae26f0c35caded95923c /drivers/net/ethernet/sfc | |
| parent | eb3c0d83cc78361a28e52e514a7095fdbf771e7e (diff) | |
| parent | 693dcd2fb23a19b29ebff786b3283cc7eeb60edb (diff) | |
Merge branch 'qlcnic'
Shahed Shaikh says:
====================
This patch series contains -
* Enhanced PVID handling for 84xx adapters by
not indicating PVID configuration to VF driver and
keeping VF driver in no VLAN configuration mode becasue
adapter supports VLAN stripping.
* Removed inappropriate usage of inline keyword.
* Enhanced minidump feature by using firmware recommended
dump capture mask and using CAMRAM register to store
firmware dump state.
* AER handling support for 83xx adapter.
* Added support for per port eswitch configuration.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc')
0 files changed, 0 insertions, 0 deletions