xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "net/smc: Replace ib_query_gid with rdma_get_gid_attr"

Browse Source 
This reverts commit ddb457c699.

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>
This commit is contained in:
Jason Gunthorpe
2018-08-15 16:52:58 -06:00
parent 89982f7cce
commit 92f4e77c85
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
net/smc/smc_ib.c
View File

@@ -373,21 +373,17 @@ void smc_ib_buf_unmap_sg(struct smc_ib_device *smcibdev,
static int smc_ib_fill_gid_and_mac(struct smc_ib_device *smcibdev, u8 ibport)
{
const struct ib_gid_attr *gattr;
int rc = 0;
struct ib_gid_attr gattr;
int rc;
gattr = rdma_get_gid_attr(smcibdev->ibdev, ibport, 0);
if (IS_ERR(gattr))
return PTR_ERR(gattr);
if (!gattr->ndev) {
rc = -ENODEV;
goto done;
}
smcibdev->gid[ibport - 1] = gattr->gid;
memcpy(smcibdev->mac[ibport - 1], gattr->ndev->dev_addr, ETH_ALEN);
done:
rdma_put_gid_attr(gattr);
return rc;
rc = ib_query_gid(smcibdev->ibdev, ibport, 0,
&smcibdev->gid[ibport - 1], &gattr);
if (rc || !gattr.ndev)
return -ENODEV;
memcpy(smcibdev->mac[ibport - 1], gattr.ndev->dev_addr, ETH_ALEN);
dev_put(gattr.ndev);
return 0;
}
/* Create an identifier unique for this instance of SMC-R.