diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-22 19:53:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-22 19:53:55 -0700 |
| commit | 2dbe82d0d11836279703dcf2679e711e18c23eec (patch) | |
| tree | f68f7322365a1af4acc7354672466edd76e627e2 /drivers/net/ethernet/sfc/net_driver.h | |
| parent | 7861f12bfd9f63e346b33a2b9841136f541dfbe3 (diff) | |
| parent | ea1c1af1396cac9f8a1160acdac17f80e4b4f2c4 (diff) | |
| download | linux-2dbe82d0d11836279703dcf2679e711e18c23eec.tar.gz linux-2dbe82d0d11836279703dcf2679e711e18c23eec.tar.bz2 linux-2dbe82d0d11836279703dcf2679e711e18c23eec.zip | |
Merge branch 'mlx4-next'
Amir Vadai says:
====================
Mellanox driver update Jul-22-2014
This patchset contains a fix by Eyal to fix a bug in mlx4_en with bonding
alb/tlb mode.
The second patch, by me, is an ethtool private flag that enable turning off the
BlueFlame hardware feature.
The last two patches, introduce a new low memory profile for mlx4_en and
mlx4_core. This mode is useful when running from a limited resources
environment, like kdump. This will reduce the memory consumed by both drivers
from more than 100M to ~30M.
This patchset was applied and tested on commit 575a193 ("net: mvpp2: Fix error
return code in mvpp2_probe")
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/net_driver.h')
0 files changed, 0 insertions, 0 deletions