]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'be2net'
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2014 17:41:42 +0000 (13:41 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Apr 2014 17:41:42 +0000 (13:41 -0400)
commit050883361d3229e5c1b7d9ecb5b02abc7880b18b
tree37889e4b5e71892beadcd3fcff25da9033d81c3a
parenta3b76956d03b6de71cbe2be6c3c3abda21d8bf96
parent271b6bee60abbf8f408ab7a309a4a0ae6c6d96b8
Merge branch 'be2net'

Sathya Perla says:

====================
be2net: patch set

Patch 1/2 is a v2 of a patch that was submitted earlier (as a part of a
different patch-set). v2 incorporates a suggestion given by David Laight
for how long to poll for pending TX completions while disabling a device.

Patch 2/2 fixes a crash in be_remove()->be_close()
path after be2net has aborted an EEH error recovery
due to a permanant failure.
====================

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