diff options
| author | David S. Miller <davem@davemloft.net> | 2014-07-09 06:58:54 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-09 06:58:54 +0400 |
| commit | 2167cefc9e07753d158a56be0c58eb7702aa122b (patch) | |
| tree | 21d8b55f81282fecf3c4c7bbe3880f508368abbd /include | |
| parent | 9274f9f895be561274ac13b37494abbc4243aebc (diff) | |
| parent | 2695bab2a6a18f31839c4e862eba3b450c0d2868 (diff) | |
| download | linux-2167cefc9e07753d158a56be0c58eb7702aa122b.tar.xz | |
Merge branch 'mlx4-next'
Amir Vadai says:
====================
Mellanox driver update Jul-08-2014
This patch set introduce some small bug fixes.
Most of the patches are small fixes to cornet case bugs.
The patch by Noa ("Fix mac_hash database inconsistency") was sent in the past
[1] and was droped because a fix to the bonding code was supposed to make it
unnecessary. After a second look on the patch, it is still needed even
after the direct access to dev_addr by the bonding will be fixed.
Patches were applied and tested over commit bd4578b
("drivers/net/hyperv/netvsc.c: remove unnecessary null test before kfree")
[1] - http://permalink.gmane.org/gmane.linux.network/315900
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mlx4/device.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index b12f4bbd064c..db0aef37645f 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -48,6 +48,17 @@ #define MSIX_LEGACY_SZ 4 #define MIN_MSIX_P_PORT 5 +#define MLX4_NUM_UP 8 +#define MLX4_NUM_TC 8 +#define MLX4_MAX_100M_UNITS_VAL 255 /* + * work around: can't set values + * greater then this value when + * using 100 Mbps units. + */ +#define MLX4_RATELIMIT_100M_UNITS 3 /* 100 Mbps */ +#define MLX4_RATELIMIT_1G_UNITS 4 /* 1 Gbps */ +#define MLX4_RATELIMIT_DEFAULT 0x00ff + #define MLX4_ROCE_MAX_GIDS 128 #define MLX4_ROCE_PF_GIDS 16 |