Merge branch 'mlx4-time-stamping-fixes'

Browse source

Or Gerlitz says:

====================
Mellanox mlx4 driver fixes

Two small fixes from Jenny for code flows that deal with time-stamping.
====================

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

...

This commit is contained in:

David S. Miller 2015-12-18 14:48:04 -05:00

parent 62d2b157f4 90683061dd

commit 6be842f7cc

3 changed files with 15 additions and 9 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

7

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

View file

7

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

View file

10

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

View file