Commit d1f3ea76 authored by Chengchang Tang's avatar Chengchang Tang Committed by Zheng Zengkai
Browse files

RDMA/hns: Remove unnecessary check for the sgid_attr when modifying QP 

mainline inclusion
from mainline-for-linus
commit c2fcafa7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5CHIG
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?id=c2fcafa78a33576b7fe47f5e4f85d413a62c2fe2

----------------------------------------------------------------------

The sgid_attr cannot be null in this scenario. This judgment is redundant.

Fixes: 606bf89e ("RDMA/hns: Refactor for hns_roce_v2_modify_qp function")
Link: https://lore.kernel.org/r/20220409083254.9696-2-liangwenpeng@huawei.com


Signed-off-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarWenpeng Liang <liangwenpeng@huawei.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarZhengfeng Luo <luozhengfeng@h-partners.com>
Reviewed-by: default avatarYangyang Li <liyangyang20@huawei.com>
Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 84580133

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+1 −3
Original line number Diff line number Diff line
@@ -4650,9 +4650,7 @@ static int hns_roce_v2_set_path(struct ib_qp *ibqp, 
		if (ret)

			return ret;



		if (gid_attr)

			is_udp = (gid_attr->gid_type ==

				 IB_GID_TYPE_ROCE_UDP_ENCAP);

		is_udp = (gid_attr->gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP);

	}



	/* Only HIP08 needs to set the vlan_en bits in QPC */