Merge branch 'bnx2x'

Browse source

Michal Schmidt says:

====================
bnx2x: fewer error messages, simplification

This removes one redundant error message in bnx2x and changes another one to
WARN_ONCE. The third patch is a small simplification in ethtool stats.
====================

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

...

This commit is contained in:

David S. Miller 2015-12-05 19:00:03 -05:00

parent b618aaa91b 44c33c6631

commit 04f96468f7

2 changed files with 58 additions and 65 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

View file

117

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

View file