diff options
author | Roland Dreier <roland@purestorage.com> | 2014-05-30 18:38:58 -0400 |
---|---|---|
committer | Roland Dreier <roland@purestorage.com> | 2014-05-30 18:38:58 -0400 |
commit | 165cb465f73c33c4fb9a79951a623083291c6f1e (patch) | |
tree | bd973a9cbf74cb73e71a0e0a52c77bfb252d6bc9 | |
parent | 65fed8a8c155271cf647651bd62eecb5928ae3a4 (diff) |
mlx4_core: Move handling of MLX4_QP_ST_MLX to proper switch statement
The handling of MLX4_QP_ST_MLX in verify_qp_parameters() was
accidentally put inside the inner switch statement (that handles which
transition of RC/UC/XRC QPs is happening). Fix this by moving the case
to the outer switch statement.
The compiler pointed this out with:
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c: In function 'verify_qp_parameters':
>> drivers/net/ethernet/mellanox/mlx4/resource_tracker.c:2875:3: warning: case value '7' not in enumerated type 'enum qp_transition' [-Wswitch]
case MLX4_QP_ST_MLX:
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 99ec41d0a48c ("mlx4: Add infrastructure for selecting VFs to enable QP0 via MLX proxy QPs")
Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index ad98162a8d79..10db83ee0e58 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | |||
@@ -2872,25 +2872,25 @@ static int verify_qp_parameters(struct mlx4_dev *dev, | |||
2872 | return -EINVAL; | 2872 | return -EINVAL; |
2873 | } | 2873 | } |
2874 | break; | 2874 | break; |
2875 | case MLX4_QP_ST_MLX: | ||
2876 | qpn = vhcr->in_modifier & 0x7fffff; | ||
2877 | port = (qp_ctx->pri_path.sched_queue >> 6 & 1) + 1; | ||
2878 | if (transition == QP_TRANS_INIT2RTR && | ||
2879 | slave != mlx4_master_func_num(dev) && | ||
2880 | mlx4_is_qp_reserved(dev, qpn) && | ||
2881 | !mlx4_vf_smi_enabled(dev, slave, port)) { | ||
2882 | /* only enabled VFs may create MLX proxy QPs */ | ||
2883 | mlx4_err(dev, "%s: unprivileged slave %d attempting to create an MLX proxy special QP on port %d\n", | ||
2884 | __func__, slave, port); | ||
2885 | return -EPERM; | ||
2886 | } | ||
2887 | break; | ||
2888 | |||
2889 | default: | 2875 | default: |
2890 | break; | 2876 | break; |
2891 | } | 2877 | } |
2878 | break; | ||
2892 | 2879 | ||
2880 | case MLX4_QP_ST_MLX: | ||
2881 | qpn = vhcr->in_modifier & 0x7fffff; | ||
2882 | port = (qp_ctx->pri_path.sched_queue >> 6 & 1) + 1; | ||
2883 | if (transition == QP_TRANS_INIT2RTR && | ||
2884 | slave != mlx4_master_func_num(dev) && | ||
2885 | mlx4_is_qp_reserved(dev, qpn) && | ||
2886 | !mlx4_vf_smi_enabled(dev, slave, port)) { | ||
2887 | /* only enabled VFs may create MLX proxy QPs */ | ||
2888 | mlx4_err(dev, "%s: unprivileged slave %d attempting to create an MLX proxy special QP on port %d\n", | ||
2889 | __func__, slave, port); | ||
2890 | return -EPERM; | ||
2891 | } | ||
2893 | break; | 2892 | break; |
2893 | |||
2894 | default: | 2894 | default: |
2895 | break; | 2895 | break; |
2896 | } | 2896 | } |