diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-03-04 19:47:33 +0000 |
| commit | ca65be80fd770188b15b4aecdd245ddbeb7f46ed (patch) | |
| tree | b76068543cf8760cf057750c9cd4fdd7ab5834d4 /sys/ofed/drivers/net/mlx4/mlx4_en.h | |
| parent | 4104449570e3e74d77537f3a798fbdd632ad311c (diff) | |
| parent | fb64e73880228db0132e7001564d85d5e33a40ea (diff) | |
| download | src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.tar.gz src-ca65be80fd770188b15b4aecdd245ddbeb7f46ed.zip | |
Merge ^/head r279313 through r279595.
Notes
Notes:
svn path=/projects/clang360-import/; revision=279596
Diffstat (limited to 'sys/ofed/drivers/net/mlx4/mlx4_en.h')
| -rw-r--r-- | sys/ofed/drivers/net/mlx4/mlx4_en.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/ofed/drivers/net/mlx4/mlx4_en.h b/sys/ofed/drivers/net/mlx4/mlx4_en.h index 30f7ead74691..f74865c99b03 100644 --- a/sys/ofed/drivers/net/mlx4/mlx4_en.h +++ b/sys/ofed/drivers/net/mlx4/mlx4_en.h @@ -154,7 +154,7 @@ enum { #define MLX4_EN_NUM_UP 1 #define MAX_TX_RINGS (MLX4_EN_MAX_TX_RING_P_UP * \ - (MLX4_EN_NUM_UP + 1)) + MLX4_EN_NUM_UP) #define MLX4_EN_DEF_TX_RING_SIZE 1024 #define MLX4_EN_DEF_RX_RING_SIZE 1024 @@ -358,11 +358,7 @@ struct mlx4_en_rx_ring { static inline int mlx4_en_can_lro(__be16 status) { - static __be16 status_all; - static __be16 status_ipv4_ipok_tcp; - static __be16 status_ipv6_ipok_tcp; - - status_all = cpu_to_be16( + const __be16 status_all = cpu_to_be16( MLX4_CQE_STATUS_IPV4 | MLX4_CQE_STATUS_IPV4F | MLX4_CQE_STATUS_IPV6 | @@ -370,11 +366,11 @@ static inline int mlx4_en_can_lro(__be16 status) MLX4_CQE_STATUS_TCP | MLX4_CQE_STATUS_UDP | MLX4_CQE_STATUS_IPOK); - status_ipv4_ipok_tcp = cpu_to_be16( + const __be16 status_ipv4_ipok_tcp = cpu_to_be16( MLX4_CQE_STATUS_IPV4 | MLX4_CQE_STATUS_IPOK | MLX4_CQE_STATUS_TCP); - status_ipv6_ipok_tcp = cpu_to_be16( + const __be16 status_ipv6_ipok_tcp = cpu_to_be16( MLX4_CQE_STATUS_IPV6 | MLX4_CQE_STATUS_IPOK | MLX4_CQE_STATUS_TCP); @@ -384,7 +380,6 @@ static inline int mlx4_en_can_lro(__be16 status) status == status_ipv6_ipok_tcp); } - struct mlx4_en_cq { struct mlx4_cq mcq; struct mlx4_hwq_resources wqres; |