From: David S. Miller <davem@davemloft.net>
Date: Sat, 12 Dec 2015 04:34:06 +0000 (-0500)
Subject: Merge branch 'bnxt_en-fixes'
X-Git-Tag: firefly_0821_release~176^2~553^2~41
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=173d26f8d50528005e0daaeb890b695a3b48f1f9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bnxt_en-fixes'

Michael Chan says:

====================
bnxt_en: Bug fix and add tx timeout recovery.

Fix a bitmap declaration bug and add missing tx timeout recovery.

v2: Fixed white space error.  Thanks Dave.
====================

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

173d26f8d50528005e0daaeb890b695a3b48f1f9