summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJason Gunthorpe <jgg@mellanox.com>2018-08-15 16:52:58 -0600
committerJason Gunthorpe <jgg@mellanox.com>2018-08-16 14:03:34 -0600
commit92f4e77c85918eab5e5803d7e28ab89a7e6bd3a2 (patch)
tree70ce3b5c8152fc5e92043e6c0d2ef4bc00678408 /include
parent89982f7ccee2fcd8fea7936b81eec6defbf0f131 (diff)
downloadlinux-92f4e77c85918eab5e5803d7e28ab89a7e6bd3a2.tar.bz2
Revert "net/smc: Replace ib_query_gid with rdma_get_gid_attr"
This reverts commit ddb457c6993babbcdd41fca638b870d2a2fc3941. The include rdma/ib_cache.h is kept, and we have to add a memset to the compat wrapper to avoid compiler warnings in gcc-7 This revert is done to avoid extensive merge conflicts with SMC changes in netdev during the 4.19 merge window. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'include')
-rw-r--r--include/rdma/ib_cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/rdma/ib_cache.h b/include/rdma/ib_cache.h
index a4ce441f36f0..3e11e7cc60b7 100644
--- a/include/rdma/ib_cache.h
+++ b/include/rdma/ib_cache.h
@@ -143,6 +143,7 @@ static inline __deprecated int ib_query_gid(struct ib_device *device,
{
const struct ib_gid_attr *attr;
+ memset(attr_out, 0, sizeof(*attr_out));
attr = rdma_get_gid_attr(device, port_num, index);
if (IS_ERR(attr))
return PTR_ERR(attr);