UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/smc: replace function pointer get_netdev() 

SMC should not open code the function pointer get_netdev of the
IB device. Replacing ib_query_gid(..., NULL) with
ib_query_gid(..., gid_attr) allows access to the netdev.

Signed-off-by: Ursula Braun <ubraun@linux.vnet.ibm.com>
Suggested-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ursula Braun 2017-10-11 13:47:22 +02:00 committed by David S. Miller
parent d71a756ad5
commit d921c420d2
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/smc/smc_ib.c
View File

@ -369,26 +369,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) static int smc_ib_fill_gid_and_mac(struct smc_ib_device *smcibdev, u8 ibport)
{ {
struct net_device *ndev; struct ib_gid_attr gattr;
int rc; int rc;
rc = ib_query_gid(smcibdev->ibdev, ibport, 0, rc = ib_query_gid(smcibdev->ibdev, ibport, 0,
&smcibdev->gid[ibport - 1], NULL); &smcibdev->gid[ibport - 1], &gattr);
/* the SMC protocol requires specification of the roce MAC address; if (rc || !gattr.ndev)
* if net_device cannot be determined, it can be derived from gid 0 return -ENODEV;
*/
ndev = smcibdev->ibdev->get_netdev(smcibdev->ibdev, ibport); memcpy(smcibdev->mac[ibport - 1], gattr.ndev->dev_addr, ETH_ALEN);
if (ndev) { dev_put(gattr.ndev);
memcpy(&smcibdev->mac, ndev->dev_addr, ETH_ALEN); return 0;
dev_put(ndev);
} else if (!rc) {
memcpy(&smcibdev->mac[ibport - 1][0],
&smcibdev->gid[ibport - 1].raw[8], 3);
memcpy(&smcibdev->mac[ibport - 1][3],
&smcibdev->gid[ibport - 1].raw[13], 3);
smcibdev->mac[ibport - 1][0] &= ~0x02;
}
return rc;
} }
/* Create an identifier unique for this instance of SMC-R. /* Create an identifier unique for this instance of SMC-R.
@ -419,6 +410,7 @@ int smc_ib_remember_port_attr(struct smc_ib_device *smcibdev, u8 ibport)
&smcibdev->pattr[ibport - 1]); &smcibdev->pattr[ibport - 1]);
if (rc) if (rc)
goto out; goto out;
/* the SMC protocol requires specification of the RoCE MAC address */
rc = smc_ib_fill_gid_and_mac(smcibdev, ibport); rc = smc_ib_fill_gid_and_mac(smcibdev, ibport);
if (rc) if (rc)
goto out; goto out;