Merge branch 'qlcnic-next'

Browse source

Harish Patil says:

====================
qlcnic: Enhance Tx timeout debug data collection.

The following set of patches are for enhancing Tx timeout debug collection

- Collect a firmware dump on first Tx timeout if netif_msg_tx_err() is set
- Log Receive and Status ring info on Tx timeout, in addition to Tx ring info
- Log additional Tx ring info if netif_msg_tx_err() is set
- Update driver version to 5.3.61

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

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

...

This commit is contained in:

David S. Miller 2014-07-02 17:11:00 -07:00

parent fb0d164cc1 28470572a6

commit af7efaff26

2 changed files with 37 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/net/ethernet/qlogic/qlcnic/qlcnic.h

View file

41

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

View file