| commit | d5f2cffc49ae27aff52eeda6206acb5db54693c9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 18 14:55:07 2013 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 18 14:55:07 2013 -0400 |
| tree | 4e9ea7b33bc2001b26293057f38b811fde87c487 | |
| parent | 026ac677414c62550269d53907ea47412ec2bd81 [diff] | |
| parent | 7bc27a8cd4db2e6ed71d29b5ceae5b4ee873c9af [diff] |
Merge branch 'qlogic' 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>