From: David S. Miller <davem@davemloft.net>
Date: Wed, 29 Apr 2015 18:48:36 +0000 (-0400)
Subject: Merge branch 'bnx2x'
X-Git-Tag: firefly_0821_release~176^2~1829^2~21
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad93e1d7b9f63bb842925711240e9fba3a104fea;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bnx2x'

Michal Schmidt says:

====================
bnx2x: minor cleanups related to TPA bits

I noticed some simplification possibilities while looking into the bug
fixed by "bnx2x: really disable TPA if 'disable_tpa' is set'.
====================

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

ad93e1d7b9f63bb842925711240e9fba3a104fea