summaryrefslogtreecommitdiff
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorWeihang Li <liweihang@huawei.com>2020-12-11 04:37:30 +0300
committerJason Gunthorpe <jgg@nvidia.com>2020-12-11 22:21:34 +0300
commit94a8c4dfcdb2b4fcb3dfafc39c1033a0b4637c86 (patch)
tree43c05adbbe2b8123fb3facac77ad9fc26ac9ae6c /drivers/infiniband
parent603bee935f38080a3674c763c50787751e387779 (diff)
downloadlinux-94a8c4dfcdb2b4fcb3dfafc39c1033a0b4637c86.tar.xz
RDMA/hns: Avoid filling sl in high 3 bits of vlan_id
Only the low 12 bits of vlan_id is valid, and service level has been filled in Address Vector. So there is no need to fill sl in vlan_id in Address Vector. Fixes: 7406c0036f85 ("RDMA/hns: Only record vlan info for HIP08") Link: https://lore.kernel.org/r/1607650657-35992-5-git-send-email-liweihang@huawei.com Signed-off-by: Weihang Li <liweihang@huawei.com> Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/hns/hns_roce_ah.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/infiniband/hw/hns/hns_roce_ah.c b/drivers/infiniband/hw/hns/hns_roce_ah.c
index c9a44dbe60d4..cc258edec331 100644
--- a/drivers/infiniband/hw/hns/hns_roce_ah.c
+++ b/drivers/infiniband/hw/hns/hns_roce_ah.c
@@ -36,9 +36,6 @@
#include <rdma/ib_cache.h>
#include "hns_roce_device.h"
-#define VLAN_SL_MASK 7
-#define VLAN_SL_SHIFT 13
-
static inline u16 get_ah_udp_sport(const struct rdma_ah_attr *ah_attr)
{
u32 fl = ah_attr->grh.flow_label;
@@ -84,18 +81,12 @@ int hns_roce_create_ah(struct ib_ah *ibah, struct rdma_ah_init_attr *init_attr,
/* HIP08 needs to record vlan info in Address Vector */
if (hr_dev->pci_dev->revision <= PCI_REVISION_ID_HIP08) {
- ah->av.vlan_en = 0;
-
ret = rdma_read_gid_l2_fields(ah_attr->grh.sgid_attr,
&ah->av.vlan_id, NULL);
if (ret)
return ret;
- if (ah->av.vlan_id < VLAN_N_VID) {
- ah->av.vlan_en = 1;
- ah->av.vlan_id |= (rdma_ah_get_sl(ah_attr) & VLAN_SL_MASK) <<
- VLAN_SL_SHIFT;
- }
+ ah->av.vlan_en = ah->av.vlan_id < VLAN_N_VID;
}
return ret;