diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:10:23 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:10:23 -0400 |
| commit | d3cf4d9915c4fb60aeef580973aa77420e600746 (patch) | |
| tree | 101f4c94eaa9d4c11673a41a7e5f2280fa59227d /include/rdma | |
| parent | 3e5f0881f17525e3b49835947a5e0cf2d681b1e2 (diff) | |
| parent | 9d6fd7aca149e2c95915447f76b125dc2123db45 (diff) | |
| download | linux-d3cf4d9915c4fb60aeef580973aa77420e600746.tar.bz2 | |
Merge branch 'misc' into k.o/for-next
Conflicts:
drivers/infiniband/core/iwcm.c - The rdma_netlink patches in
HEAD and the iwarp cm workqueue fix (don't use WQ_MEM_RECLAIM,
we aren't safe for that context) touched the same code.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/rdma')
| -rw-r--r-- | include/rdma/ib_addr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index 7aca12188ef3..ec5008cf5d51 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -172,7 +172,8 @@ static inline int rdma_ip2gid(struct sockaddr *addr, union ib_gid *gid) (struct in6_addr *)gid); break; case AF_INET6: - memcpy(gid->raw, &((struct sockaddr_in6 *)addr)->sin6_addr, 16); + *(struct in6_addr *)&gid->raw = + ((struct sockaddr_in6 *)addr)->sin6_addr; break; default: return -EINVAL; |