From 92f4e77c85918eab5e5803d7e28ab89a7e6bd3a2 Mon Sep 17 00:00:00 2001 From: Jason Gunthorpe Date: Wed, 15 Aug 2018 16:52:58 -0600 Subject: 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 --- include/rdma/ib_cache.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/rdma') 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); -- cgit