diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2022-02-08 12:55:27 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2022-02-08 12:55:27 -0400 |
| commit | 2f1b2820b546c1eef07d15ed73db4177c0cf6d46 (patch) | |
| tree | 9b5a426669759f91e72abbd909edb84884d8a56d /drivers/infiniband/hw/irdma/verbs.c | |
| parent | b1377cc37f6bebd57ce8747b7e16163a475af295 (diff) | |
| parent | 4b860c9169dcb8aead7e1744327c52a253f5c5fd (diff) | |
Merge branch 'irdma_dscp' into rdma.git for-next
Shiraz Saleem says:
====================
Add support for DSCP QoS
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/linux iwl-next
====================
Link: https://lore.kernel.org/r/20220207235921.1303522-1-anthony.l.nguyen@intel.com/
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/infiniband/hw/irdma/verbs.c')
| -rw-r--r-- | drivers/infiniband/hw/irdma/verbs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c index 460e757d3fe6..7b144e57578e 100644 --- a/drivers/infiniband/hw/irdma/verbs.c +++ b/drivers/infiniband/hw/irdma/verbs.c @@ -1189,7 +1189,7 @@ int irdma_modify_qp_roce(struct ib_qp *ibqp, struct ib_qp_attr *attr, if (ret) return ret; - if (vlan_id >= VLAN_N_VID && iwdev->dcb) + if (vlan_id >= VLAN_N_VID && iwdev->dcb_vlan_mode) vlan_id = 0; if (vlan_id < VLAN_N_VID) { udp_info->insert_vlan_tag = true; @@ -4229,7 +4229,7 @@ static int irdma_create_ah(struct ib_ah *ibah, goto error; } - if (ah_info->vlan_tag >= VLAN_N_VID && iwdev->dcb) + if (ah_info->vlan_tag >= VLAN_N_VID && iwdev->dcb_vlan_mode) ah_info->vlan_tag = 0; if (ah_info->vlan_tag < VLAN_N_VID) { |