From: David S. Miller <davem@davemloft.net>
Date: Mon, 14 Apr 2014 17:41:42 +0000 (-0400)
Subject: Merge branch 'be2net'
X-Git-Tag: firefly_0821_release~176^2~4050^2~16
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=677df2f4aefaf9a87f6a37cc38453515547f4bda;p=firefly-linux-kernel-4.4.55.git

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>
---

677df2f4aefaf9a87f6a37cc38453515547f4bda