Unverified Commit 5b28bbbd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10328 net/smc: enable smcrv1 when RNIC supports rocev2 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/I4A4KDXNLPL3SN5JOEN3CJHN26HELTTD/ 
 
https://gitee.com/openeuler/kernel/issues/IAFYD8 
 
Link:https://gitee.com/openeuler/kernel/pulls/10328

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 6a98a049 e3d017c1

net/smc/smc_ib.c

+1 −2
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ int smc_ib_determine_gid(struct smc_ib_device *smcibdev, u8 ibport, 
		if (!IS_ERR(ndev) &&

		    ((!vlan_id && !is_vlan_dev(ndev)) ||

		     (vlan_id && is_vlan_dev(ndev) &&

		      vlan_dev_vlan_id(ndev) == vlan_id)) &&

		    attr->gid_type == IB_GID_TYPE_ROCE) {

		      vlan_dev_vlan_id(ndev) == vlan_id))) {

			rcu_read_unlock();

			if (gid)

				memcpy(gid, &attr->gid, SMC_GID_SIZE);