diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 20:48:24 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 20:48:24 -0400 |
| commit | 262b8b63d2af08dafd5124c12f4b56d06afcdf3f (patch) | |
| tree | b2aeeb02dcab40fbb0e607cd01dd06f1fc79179c | |
| parent | f5fc33e4e6450785d10448d1a6bd970ca18f4ca4 (diff) | |
| download | longterm-queue-4.12-262b8b63d2af08dafd5124c12f4b56d06afcdf3f.tar.gz | |
IB: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/IB-core-Fix-endianness-annotation-in-rdma_is_multica.patch | 37 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 38 deletions
diff --git a/queue/IB-core-Fix-endianness-annotation-in-rdma_is_multica.patch b/queue/IB-core-Fix-endianness-annotation-in-rdma_is_multica.patch deleted file mode 100644 index b5c9d4a..0000000 --- a/queue/IB-core-Fix-endianness-annotation-in-rdma_is_multica.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1c3aea2bc8f0b2e5b57375ead40457ff75a3a2ec Mon Sep 17 00:00:00 2001 -From: Bart Van Assche <bart.vanassche@wdc.com> -Date: Wed, 11 Oct 2017 10:48:43 -0700 -Subject: [PATCH] IB/core: Fix endianness annotation in - rdma_is_multicast_addr() - -commit 1c3aea2bc8f0b2e5b57375ead40457ff75a3a2ec upstream. - -Since ipv4_addr is a big endian 32-bit number, annotate it as such. - -Fixes: commit be1d325a3358 ("IB/core: Set RoCEv2 MGID according to spec") -Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com> -Reviewed-by: Leon Romanovsky <leonro@mellanox.com> -Signed-off-by: Doug Ledford <dledford@redhat.com> - -diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h -index ec5008cf5d51..cfa82d16573d 100644 ---- a/include/rdma/ib_addr.h -+++ b/include/rdma/ib_addr.h -@@ -305,12 +305,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)); - } - --- -2.15.0 - diff --git a/queue/series b/queue/series index f7548e1..2f0631f 100644 --- a/queue/series +++ b/queue/series @@ -108,7 +108,6 @@ md-cluster-fix-wrong-condition-check-in-raid1_write_.patch xprtrdma-Don-t-defer-fencing-an-async-RPC-s-chunks.patch udf-Avoid-overflow-when-session-starts-at-large-offs.patch macvlan-Only-deliver-one-copy-of-the-frame-to-the-ma.patch -IB-core-Fix-endianness-annotation-in-rdma_is_multica.patch RDMA-cma-Avoid-triggering-undefined-behavior.patch IB-ipoib-Grab-rtnl-lock-on-heavy-flush-when-calling-.patch icmp-don-t-fail-on-fragment-reassembly-time-exceeded.patch |