diff options
author | David Decotigny <decot@googlers.com> | 2016-09-28 14:00:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-30 01:56:41 -0400 |
commit | 5038056e6bd45788235e97e3bcfc43f96c52ca84 (patch) | |
tree | 82aed21ab9c0e0d8ea7422ef485a1a02d88a46f5 | |
parent | bd11f0741fa5a2c296629898ad07759dd12b35bb (diff) |
mlx4: remove unused fields
This also can address following UBSAN warnings:
[ 36.640343] ================================================================================
[ 36.648772] UBSAN: Undefined behaviour in drivers/net/ethernet/mellanox/mlx4/fw.c:857:26
[ 36.656853] shift exponent 64 is too large for 32-bit type 'int'
[ 36.663348] ================================================================================
[ 36.671783] ================================================================================
[ 36.680213] UBSAN: Undefined behaviour in drivers/net/ethernet/mellanox/mlx4/fw.c:861:27
[ 36.688297] shift exponent 35 is too large for 32-bit type 'int'
[ 36.694702] ================================================================================
Tested:
reboot with UBSAN, no warning.
Signed-off-by: David Decotigny <decot@googlers.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/fw.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.c b/drivers/net/ethernet/mellanox/mlx4/fw.c index 090bf81076e8..f9cbc67f1694 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/drivers/net/ethernet/mellanox/mlx4/fw.c | |||
@@ -853,12 +853,8 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
853 | dev_cap->max_eqs = 1 << (field & 0xf); | 853 | dev_cap->max_eqs = 1 << (field & 0xf); |
854 | MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET); | 854 | MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MTT_OFFSET); |
855 | dev_cap->reserved_mtts = 1 << (field >> 4); | 855 | dev_cap->reserved_mtts = 1 << (field >> 4); |
856 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MRW_SZ_OFFSET); | ||
857 | dev_cap->max_mrw_sz = 1 << field; | ||
858 | MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MRW_OFFSET); | 856 | MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_MRW_OFFSET); |
859 | dev_cap->reserved_mrws = 1 << (field & 0xf); | 857 | dev_cap->reserved_mrws = 1 << (field & 0xf); |
860 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_MTT_SEG_OFFSET); | ||
861 | dev_cap->max_mtt_seg = 1 << (field & 0x3f); | ||
862 | MLX4_GET(size, outbox, QUERY_DEV_CAP_NUM_SYS_EQ_OFFSET); | 858 | MLX4_GET(size, outbox, QUERY_DEV_CAP_NUM_SYS_EQ_OFFSET); |
863 | dev_cap->num_sys_eqs = size & 0xfff; | 859 | dev_cap->num_sys_eqs = size & 0xfff; |
864 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_REQ_QP_OFFSET); | 860 | MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_REQ_QP_OFFSET); |
diff --git a/drivers/net/ethernet/mellanox/mlx4/fw.h b/drivers/net/ethernet/mellanox/mlx4/fw.h index f11614f12517..5343a0599253 100644 --- a/drivers/net/ethernet/mellanox/mlx4/fw.h +++ b/drivers/net/ethernet/mellanox/mlx4/fw.h | |||
@@ -80,9 +80,7 @@ struct mlx4_dev_cap { | |||
80 | int max_eqs; | 80 | int max_eqs; |
81 | int num_sys_eqs; | 81 | int num_sys_eqs; |
82 | int reserved_mtts; | 82 | int reserved_mtts; |
83 | int max_mrw_sz; | ||
84 | int reserved_mrws; | 83 | int reserved_mrws; |
85 | int max_mtt_seg; | ||
86 | int max_requester_per_qp; | 84 | int max_requester_per_qp; |
87 | int max_responder_per_qp; | 85 | int max_responder_per_qp; |
88 | int max_rdma_global; | 86 | int max_rdma_global; |