Merge branch 'bnx2x'
authorDavid S. Miller <davem@davemloft.net>
Wed, 29 Apr 2015 18:48:36 +0000 (14:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Apr 2015 18:48:36 +0000 (14:48 -0400)
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>

Trivial merge