Merge branch 'bnx2x-fixes'

Browse source

Yuval Mintz says:

====================
bnx2x: small fixes

This adds 2 small fixes, one to error flows during memory release
and the other to flash writes via ethtool API.
====================

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

...

This commit is contained in:

David S. Miller 2015-08-10 14:31:59 -07:00

parent 21a447637d 0ea853dfa9

commit 875a74b6d6

2 changed files with 17 additions and 1 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

2

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

View file

16

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

View file