diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-11-30 15:23:18 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2018-11-30 15:23:18 +0100 |
| commit | d79e7d051790d67ee3993eebf93081b8db0d3d50 (patch) | |
| tree | 9bfe34f5a1c49c834ed8c5b4ee5ee4d4afd94bf5 /drivers/infiniband/hw/mlx5/qp.c | |
| parent | b6a8fc645976fb85cf38a78474aff4eac4521e8f (diff) | |
| parent | b32d16ec995683be888520d12d8f2833efee5dae (diff) | |
Merge tag 'v4.19.5' into linux-4.19.y-rt
This is the 4.19.5 stable release
Diffstat (limited to 'drivers/infiniband/hw/mlx5/qp.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/qp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 6cba2a02d11b..d53d954ac8af 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -3243,7 +3243,9 @@ static bool modify_dci_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state new int req = IB_QP_STATE; int opt = 0; - if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) { + if (new_state == IB_QPS_RESET) { + return is_valid_mask(attr_mask, req, opt); + } else if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) { req |= IB_QP_PKEY_INDEX | IB_QP_PORT; return is_valid_mask(attr_mask, req, opt); } else if (cur_state == IB_QPS_INIT && new_state == IB_QPS_INIT) { |