summaryrefslogtreecommitdiffstats
path: root/net/smc
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 /net/smc
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 'net/smc')
-rw-r--r--net/smc/smc_core.c19
-rw-r--r--net/smc/smc_ib.c24
2 files changed, 20 insertions, 23 deletions
diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c
index d99a75f75e42..15bad268f37d 100644
--- a/net/smc/smc_core.c
+++ b/net/smc/smc_core.c
@@ -451,7 +451,8 @@ out:
static int smc_link_determine_gid(struct smc_link_group *lgr)
{
struct smc_link *lnk = &lgr->lnk[SMC_SINGLE_LINK];
- const struct ib_gid_attr *gattr;
+ struct ib_gid_attr gattr;
+ union ib_gid gid;
int i;
if (!lgr->vlan_id) {
@@ -461,18 +462,18 @@ static int smc_link_determine_gid(struct smc_link_group *lgr)
for (i = 0; i < lnk->smcibdev->pattr[lnk->ibport - 1].gid_tbl_len;
i++) {
- gattr = rdma_get_gid_attr(lnk->smcibdev->ibdev, lnk->ibport, i);
- if (IS_ERR(gattr))
+ if (ib_query_gid(lnk->smcibdev->ibdev, lnk->ibport, i, &gid,
+ &gattr))
continue;
- if (gattr->ndev) {
- if (is_vlan_dev(gattr->ndev) &&
- vlan_dev_vlan_id(gattr->ndev) == lgr->vlan_id) {
- lnk->gid = gattr->gid;
- rdma_put_gid_attr(gattr);
+ if (gattr.ndev) {
+ if (is_vlan_dev(gattr.ndev) &&
+ vlan_dev_vlan_id(gattr.ndev) == lgr->vlan_id) {
+ lnk->gid = gid;
+ dev_put(gattr.ndev);
return 0;
}
+ dev_put(gattr.ndev);
}
- rdma_put_gid_attr(gattr);
}
return -ENODEV;
}
diff --git a/net/smc/smc_ib.c b/net/smc/smc_ib.c
index 74f29f814ec1..117b05f1a494 100644
--- a/net/smc/smc_ib.c
+++ b/net/smc/smc_ib.c
@@ -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.