Merge branch 'mlx4-net'

Browse source

Or Gerlitz says:

====================
mlx4 driver fixes for 4.0-rc

Just few small fixes for the 4.0 rc cycle.

The fix from Moni addresses an issue from 4.0-rc1 so we
just need it for net.

Eran's fix for off-by-one should go to 3.19.y too.
====================

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

...

This commit is contained in:

David S. Miller 2015-03-18 15:17:17 -04:00

parent ced585c83b 39de961a4a

commit 2fc800f2c5

4 changed files with 24 additions and 8 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

20

drivers/infiniband/hw/mlx4/mad.c

View file

6

drivers/infiniband/hw/mlx4/main.c

View file

4

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

View file

2

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

View file