| commit | ad93e1d7b9f63bb842925711240e9fba3a104fea | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Wed Apr 29 14:48:36 2015 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Wed Apr 29 14:48:36 2015 -0400 |
| tree | 6889aff43bf79b37ab3f1def9653e140368967e3 | |
| parent | 3f300ff41d89fe9674b8dbab950ba2572639ee8d [diff] | |
| parent | f8dcb5e3365a23b620f5744f23f1918b9c38d883 [diff] |
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>