diff options
| author | Doug Ledford | 2017-10-18 19:07:13 +0200 |
|---|---|---|
| committer | Doug Ledford | 2017-10-18 19:07:13 +0200 |
| commit | 754137a769ac8f13cd6c0e1bc4fc2fa768d3da63 (patch) | |
| tree | 0a39eda714b8b0bb3522654fb326e499fbe552e7 /include/rdma/ib_addr.h | |
| parent | IB/mlx5: Use ARRAY_SIZE (diff) | |
| parent | IB/srp: Make CM timeout dependent on subnet timeout (diff) | |
| download | kernel-qcow2-linux-754137a769ac8f13cd6c0e1bc4fc2fa768d3da63.tar.gz kernel-qcow2-linux-754137a769ac8f13cd6c0e1bc4fc2fa768d3da63.tar.xz kernel-qcow2-linux-754137a769ac8f13cd6c0e1bc4fc2fa768d3da63.zip | |
Merge branch 'for-next-early' into for-next
The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base. I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'include/rdma/ib_addr.h')
| -rw-r--r-- | include/rdma/ib_addr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index 8815989301ab..b2a10c762304 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h @@ -306,12 +306,12 @@ static inline void rdma_get_ll_mac(struct in6_addr *addr, u8 *mac) static inline int rdma_is_multicast_addr(struct in6_addr *addr) { - u32 ipv4_addr; + __be32 ipv4_addr; if (addr->s6_addr[0] == 0xff) return 1; - memcpy(&ipv4_addr, addr->s6_addr + 12, 4); + ipv4_addr = addr->s6_addr32[3]; return (ipv6_addr_v4mapped(addr) && ipv4_is_multicast(ipv4_addr)); } |