d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r330584:

Browse Source 
Recover IPv6 scope ID for multicast link-local addresses as well as
unicast link-local addresses.

Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2018-03-30 18:42:44 +00:00
parent d1445885e6
commit a00a837d36
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/ofed/drivers/infiniband/core/ib_cma.c
View File

@ -2785,7 +2785,8 @@ static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
struct sockaddr_in6 *src_addr6 = (struct sockaddr_in6 *) src_addr; struct sockaddr_in6 *src_addr6 = (struct sockaddr_in6 *) src_addr;
struct sockaddr_in6 *dst_addr6 = (struct sockaddr_in6 *) dst_addr; struct sockaddr_in6 *dst_addr6 = (struct sockaddr_in6 *) dst_addr;
src_addr6->sin6_scope_id = dst_addr6->sin6_scope_id; src_addr6->sin6_scope_id = dst_addr6->sin6_scope_id;
if (IN6_IS_SCOPE_LINKLOCAL(&dst_addr6->sin6_addr)) if (IN6_IS_SCOPE_LINKLOCAL(&dst_addr6->sin6_addr) ||
IN6_IS_ADDR_MC_INTFACELOCAL(&dst_addr6->sin6_addr))
id->route.addr.dev_addr.bound_dev_if = dst_addr6->sin6_scope_id; id->route.addr.dev_addr.bound_dev_if = dst_addr6->sin6_scope_id;
} else if (dst_addr->sa_family == AF_IB) { } else if (dst_addr->sa_family == AF_IB) {
((struct sockaddr_ib *) src_addr)->sib_pkey = ((struct sockaddr_ib *) src_addr)->sib_pkey =
@ -3119,13 +3120,13 @@ static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
sin6 = *(struct sockaddr_in6 *)addr; sin6 = *(struct sockaddr_in6 *)addr;
if (!(IN6_IS_SCOPE_LINKLOCAL(&sin6.sin6_addr))) if (IN6_IS_SCOPE_LINKLOCAL(&sin6.sin6_addr) ||
return 0; IN6_IS_ADDR_MC_INTFACELOCAL(&sin6.sin6_addr)) {
/* check if IPv6 scope ID is set */
if (sa6_recoverscope(&sin6) || sin6.sin6_scope_id == 0) if (sa6_recoverscope(&sin6) || sin6.sin6_scope_id == 0)
return -EINVAL; return -EINVAL;
dev_addr->bound_dev_if = sin6.sin6_scope_id;
dev_addr->bound_dev_if = sin6.sin6_scope_id; }
#endif #endif
return 0; return 0;
} }