]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'qlogic'
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Apr 2013 18:55:07 +0000 (14:55 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Apr 2013 18:55:07 +0000 (14:55 -0400)
commitdc6f7ca64afb97cb06ec69257f7179ffc8c35a61
tree4e9ea7b33bc2001b26293057f38b811fde87c487
parent10f20d6de269dac5388dc61461cb77bf785d4a4b
parentb4a2dd7ff270c31d9f19a2d4871bbdbd66a251b4
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>