diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-24 21:58:26 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-24 21:58:26 +0200 |
| commit | 732912c7386120179bf8f666febc232922e3ee17 (patch) | |
| tree | e28dea126ed19c39c3a4eccff36687d5028bda9e /drivers/infiniband/hw/mlx5 | |
| parent | rdma: Autoload netlink client modules (diff) | |
| parent | IB/mlx5: Always return success for RoCE modify port (diff) | |
| download | linux-732912c7386120179bf8f666febc232922e3ee17.tar.xz linux-732912c7386120179bf8f666febc232922e3ee17.zip | |
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Pick up -rc fixes.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/mlx5')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 6 | ||||
| -rw-r--r-- | drivers/infiniband/hw/mlx5/qp.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index e2fffdc43c86..55045e204518 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1122,6 +1122,12 @@ static int mlx5_ib_modify_port(struct ib_device *ibdev, u8 port, int mask, bool is_ib = (mlx5_ib_port_link_layer(ibdev, port) == IB_LINK_LAYER_INFINIBAND); + /* CM layer calls ib_modify_port() regardless of the link layer. For + * Ethernet ports, qkey violation and Port capabilities are meaningless. + */ + if (!is_ib) + return 0; + if (MLX5_CAP_GEN(dev->mdev, ib_virt) && is_ib) { change_mask = props->clr_port_cap_mask | props->set_port_cap_mask; value = ~props->clr_port_cap_mask | props->set_port_cap_mask; diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index e098c97e027a..bc49d14e0a00 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -1253,6 +1253,7 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, goto err_destroy_tis; sq->base.container_mibqp = qp; + sq->base.mqp.event = mlx5_ib_qp_event; } if (qp->rq.wqe_cnt) { |