diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 17:13:01 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 17:13:01 -0800 |
| commit | 5cce1cf718b02c8ea89576230db2bc2fc2e2a35a (patch) | |
| tree | 2e6934bb871f78f669e996c91bfd35f766bfabc2 /include/linux/mlx4/cmd.h | |
| parent | 4967082b469320eeba54ffbca632af1962858fb7 (diff) | |
| parent | 6d6e996c20f27091c09c813e2e73c507602839e3 (diff) | |
| download | cachepc-linux-5cce1cf718b02c8ea89576230db2bc2fc2e2a35a.tar.gz cachepc-linux-5cce1cf718b02c8ea89576230db2bc2fc2e2a35a.zip | |
Merge branch 'mlx4-next'
Amir Vadai says:
====================
Mellanox ethernet driver updates Jan-27-2015
This patchset introduces some bug fixes, code cleanups and support in a new
firmware event called recoverable error events.
Patches were applied and tested against commit b8665c6 ("net: dsa/mv88e6352:
make mv88e6352_wait generic")
Changes from V0:
- Patch 6/11 ("net/mlx4_core: Fix struct mlx4_vhcr_cmd to make implicit padding
explicit"):
- Removed __packed
- Rephrased commit message
- Added a new patch by Majd ("net/mlx4_core: Update the HCA core clock frequency
after INIT_PORT")
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mlx4/cmd.h')
| -rw-r--r-- | include/linux/mlx4/cmd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h index c989442ffc6a..ae95adc78509 100644 --- a/include/linux/mlx4/cmd.h +++ b/include/linux/mlx4/cmd.h @@ -165,9 +165,9 @@ enum { }; enum { - MLX4_CMD_TIME_CLASS_A = 10000, - MLX4_CMD_TIME_CLASS_B = 10000, - MLX4_CMD_TIME_CLASS_C = 10000, + MLX4_CMD_TIME_CLASS_A = 60000, + MLX4_CMD_TIME_CLASS_B = 60000, + MLX4_CMD_TIME_CLASS_C = 60000, }; enum { |