Skip to content

Commit f155d83

Browse files
committed
Merge: [s390] net/smc: AF_INET6 is not supported for smc-r v2 client
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/404 JIRA: https://issues.redhat.com/browse/RHEL-79809 commits; ``` c12b270 ``` Signed-off-by: Mete Durlu <mdurlu@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents a2dcc3f + 8e20c91 commit f155d83

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/smc/af_smc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,10 @@ static int smc_find_proposal_devices(struct smc_sock *smc,
11161116
ini->check_smcrv2 = true;
11171117
ini->smcrv2.saddr = smc->clcsock->sk->sk_rcv_saddr;
11181118
if (!(ini->smcr_version & SMC_V2) ||
1119-
smc->clcsock->sk->sk_family != AF_INET ||
1119+
#if IS_ENABLED(CONFIG_IPV6)
1120+
(smc->clcsock->sk->sk_family == AF_INET6 &&
1121+
!ipv6_addr_v4mapped(&smc->clcsock->sk->sk_v6_rcv_saddr)) ||
1122+
#endif
11201123
!smc_clc_ueid_count() ||
11211124
smc_find_rdma_device(smc, ini))
11221125
ini->smcr_version &= ~SMC_V2;

0 commit comments

Comments
 (0)