tree fbcc1cfbf2e720904bc6d50bc91753d99c6b31a4
parent f2068b80ca59d63ca21ee1da829c9fe09f25b08e
parent 6a531b7b1989ddef5ee45c619970037eb2374c0d
author David S. Miller <davem@davemloft.net> 1369461911 -0700
committer David S. Miller <davem@davemloft.net> 1369461911 -0700

Merge branch 'qlcnic'

Shahed Shaikh says:

====================
This patch series includes following changes:
* Support for spoof check configuration per VF using
  iproute2 tool.
* Set HW mask for 8300 adapter in INT-x mode to stop generating
  interrupts.
* Updated IRQ name for 8200 and 8300 Series adapter as per
  format used by other multiqueue drivers.
* Remove qlcnic_config_npars module parameter.
* Initialize trans_work and idc_aen_work at VF probe.
* Convert netsted if-else into switch-case statement.
* Change in diagnostics routine.
* Modify reset recovery path in diag mode by providing diagnostics
  routines enough time to unwind before proceeding with reset recovery.
* Implement GET_LED_STATUS command for 82xx adapter and refactor
  qlcnic_store_beacon() to split 8200 and 8300 specific calls.
* Some cleanup and log enhancements
====================

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