diff options
| author |   Devesh Sharma <devesh.sharma@avagotech.com> | 2015-12-24 13:14:05 -0500 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2015-12-28 11:45:54 -0500 |
| commit | c6002d5602ab36c19ef4fe0e20ecfa28aaabf028 (patch) | |
| tree | 175a9fecd8dd72a1326e4f93459a233769f0aef9 /drivers/infiniband/hw/ocrdma/ocrdma_hw.c | |
| parent | IB/mlx4: Replace kfree with kvfree in mlx4_ib_destroy_srq (diff) | |
| download | linux-dev-c6002d5602ab36c19ef4fe0e20ecfa28aaabf028.tar.xz linux-dev-c6002d5602ab36c19ef4fe0e20ecfa28aaabf028.zip | |
RDMA/ocrdma: Fix vlan-id assignment in qp parameters
vlan-id is wrongly getting as 0 when PFC is enabled.
Set vlan-id configured by user in QP parameters.
In case vlan interface is not used, flash a warning to
user to configure vlan and assign vlan-id as 0 in qp params.
Fixes: dbf727de7440 ('IB/core: Use GID table in AH creation and dmac resolution')
Cc: Matan Barak <matanb@mellanox.com>
Signed-off-by: Devesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/ocrdma/ocrdma_hw.c')
| -rw-r--r-- | drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c index 30f67bebffa3..4fc2bb49c28e 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c @@ -2515,9 +2515,10 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, ocrdma_cpu_to_le32(&cmd->params.sgid[0], sizeof(cmd->params.sgid)); cmd->params.vlan_dmac_b4_to_b5 = mac_addr[4] | (mac_addr[5] << 8); - if (vlan_id < 0x1000) { - if (dev->pfc_state) { - vlan_id = 0; + if (vlan_id == 0xFFFF) + vlan_id = 0; + if (vlan_id || dev->pfc_state) { + if (!vlan_id) { pr_err("ocrdma%d:Using VLAN with PFC is recommended\n", dev->id); pr_err("ocrdma%d:Using VLAN 0 for this connection\n", |