Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08b49b94 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'smc-ib_query_gid' 



Ursula Braun says:

====================
net/smc: ib_query_gid() patches

triggered by Parav Pandit here are 2 cleanup patches for usage of
ib_query_gid() in the smc-code.

Thanks, Ursula

v2 changes advised by Parav Pandit:
   extra check is_vlan_dev() in patch 2/2
   "RoCE" spelling
   added "Reported-by"
   added "Reviewed-by"
   added "Fixes"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d71a756a 43e2ada3

net/smc/smc_core.c

+8 −4
Original line number Diff line number Diff line
@@ -380,11 +380,15 @@ static int smc_link_determine_gid(struct smc_link_group *lgr) 
		if (ib_query_gid(lnk->smcibdev->ibdev, lnk->ibport, i, &gid,

				 &gattr))

			continue;

		if (gattr.ndev &&

		    (vlan_dev_vlan_id(gattr.ndev) == lgr->vlan_id)) {

		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);

		}

	}

	return -ENODEV;

}

net/smc/smc_ib.c

+9 −17
Original line number Diff line number Diff line
@@ -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)

{

	struct net_device *ndev;

	struct ib_gid_attr gattr;

	int rc;



	rc = ib_query_gid(smcibdev->ibdev, ibport, 0,

			  &smcibdev->gid[ibport - 1], NULL);

	/* the SMC protocol requires specification of the roce MAC address;

	 * if net_device cannot be determined, it can be derived from gid 0

	 */

	ndev = smcibdev->ibdev->get_netdev(smcibdev->ibdev, ibport);

	if (ndev) {

		memcpy(&smcibdev->mac, ndev->dev_addr, ETH_ALEN);

		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;

			  &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.
@@ -419,6 +410,7 @@ int smc_ib_remember_port_attr(struct smc_ib_device *smcibdev, u8 ibport) 
			   &smcibdev->pattr[ibport - 1]);

	if (rc)

		goto out;

	/* the SMC protocol requires specification of the RoCE MAC address */

	rc = smc_ib_fill_gid_and_mac(smcibdev, ibport);

	if (rc)

		goto out;