Commit 2493a57b authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA/cma: Refactor to access multiple fields of rdma_dev_addr 



Pass the rdma_cm_id so that multiple fields of the rdma_dev_addr
structure can be accessed, instead of passing each individual fields.

This is needed to access some additional fields in followup patches.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 00db63c1

drivers/infiniband/core/cma.c

+8 −7
Original line number Diff line number Diff line
@@ -612,11 +612,14 @@ static int cma_translate_addr(struct sockaddr *addr, struct rdma_dev_addr *dev_a 


static inline int cma_validate_port(struct ib_device *device, u8 port,

				    enum ib_gid_type gid_type,

				      union ib_gid *gid, int dev_type,

				      int bound_if_index)

				    union ib_gid *gid,

				    struct rdma_id_private *id_priv)

{

	int ret = -ENODEV;

	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;

	int bound_if_index = dev_addr->bound_dev_if;

	int dev_type = dev_addr->dev_type;

	struct net_device *ndev = NULL;

	int ret = -ENODEV;



	if ((dev_type == ARPHRD_INFINIBAND) && !rdma_protocol_ib(device, port))

		return ret;
@@ -671,8 +674,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, 
					rdma_protocol_ib(cma_dev->device, port) ?

					IB_GID_TYPE_IB :

					listen_id_priv->gid_type, gidp,

					dev_addr->dev_type,

					dev_addr->bound_dev_if);

					id_priv);

		if (!ret) {

			id_priv->id.port_num = port;

			goto out;
@@ -693,8 +695,7 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv, 
						rdma_protocol_ib(cma_dev->device, port) ?

						IB_GID_TYPE_IB :

						cma_dev->default_gid_type[port - 1],

						gidp, dev_addr->dev_type,

						dev_addr->bound_dev_if);

						gidp, id_priv);

			if (!ret) {

				id_priv->id.port_num = port;

				goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE