Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 953a64ca authored by Karsten Graul's avatar Karsten Graul Committed by Greg Kroah-Hartman
Browse files

net/smc: use link_id of server in confirm link reply 



[ Upstream commit 2be922f31606f114119f48de3207d122a90e7357 ]

The CONFIRM LINK reply message must contain the link_id sent
by the server. And set the link_id explicitly when
initializing the link.

Signed-off-by: default avatarKarsten Graul <kgraul@linux.vnet.ibm.com>
Signed-off-by: default avatarUrsula Braun <ubraun@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0a5a0f4

net/smc/smc_core.c

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ static int smc_lgr_create(struct smc_sock *smc, __be32 peer_in_addr, 


	lnk = &lgr->lnk[SMC_SINGLE_LINK];

	/* initialize link */

	lnk->link_id = SMC_SINGLE_LINK;

	lnk->smcibdev = smcibdev;

	lnk->ibport = ibport;

	lnk->path_mtu = smcibdev->pattr[ibport - 1].active_mtu;

net/smc/smc_llc.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int smc_llc_send_confirm_link(struct smc_link *link, u8 mac[], 
	memcpy(confllc->sender_mac, mac, ETH_ALEN);

	memcpy(confllc->sender_gid, gid, SMC_GID_SIZE);

	hton24(confllc->sender_qp_num, link->roce_qp->qp_num);

	/* confllc->link_num = SMC_SINGLE_LINK; already done by memset above */

	confllc->link_num = link->link_id;

	memcpy(confllc->link_uid, lgr->id, SMC_LGR_ID_SIZE);

	confllc->max_links = SMC_LINKS_PER_LGR_MAX;

	/* send llc message */