Merge branch 'qlogic'

Browse source

Shahed Shaikh says:

====================
This patch series contains bug fixes for -
* Loopback test failure while traffic is running.
* Tx timeout and subsequent firmware reset by removing check for
  '(adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)' from tx fast
  path, as per Eric's suggestion.
* Typo in logs.
====================

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

...

This commit is contained in:

David S. Miller 2013-04-18 14:55:07 -04:00

parent 026ac67741 7bc27a8cd4

commit d5f2cffc49

2 changed files with 11 additions and 7 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

15

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

View file

3

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

View file