diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:01:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-25 11:01:05 +0200 |
| commit | 290d9bf2811bd83ae907232176d75690c0f7d82b (patch) | |
| tree | a3b72364248c4bc1b2bf6ed1958ea4e6d6a1564e /drivers/infiniband/hw/mlx5/main.c | |
| parent | c7f4f994dea2e6a513e63f063f6c92202b7c1f3f (diff) | |
| parent | 64aee2a965cf2954a038b5522f11d2cd2f0f8f3e (diff) | |
| download | lwn-290d9bf2811bd83ae907232176d75690c0f7d82b.tar.gz lwn-290d9bf2811bd83ae907232176d75690c0f7d82b.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/mlx5/main.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx5/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c index a7f2e60085c4..f7fcde1ff0aa 100644 --- a/drivers/infiniband/hw/mlx5/main.c +++ b/drivers/infiniband/hw/mlx5/main.c @@ -1085,6 +1085,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; |