Commit 91a3f14e authored by Mark Zhang's avatar Mark Zhang Committed by Leon Romanovsky
Browse files

IB/cm: Remove the service_mask parameter from ib_cm_listen() 

Remove the service_mask parameter of ib_cm_listen(), as all callers
use 0.

Link: https://lore.kernel.org/r/20220819090859.957943-2-markzhang@nvidia.com


Signed-off-by: default avatarMark Zhang <markzhang@nvidia.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 6edd86a2

drivers/infiniband/core/cm.c

+2 −6
Original line number Diff line number Diff line
@@ -1185,12 +1185,8 @@ static int cm_init_listen(struct cm_id_private *cm_id_priv, __be64 service_id, 
 *   and service ID resolution requests.  The service ID should be specified

 *   network-byte order.  If set to IB_CM_ASSIGN_SERVICE_ID, the CM will

 *   assign a service ID to the caller.

 * @service_mask: Mask applied to service ID used to listen across a

 *   range of service IDs.  If set to 0, the service ID is matched

 *   exactly.  This parameter is ignored if %service_id is set to

 *   IB_CM_ASSIGN_SERVICE_ID.

 */

int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask)

int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id)

{

	struct cm_id_private *cm_id_priv =

		container_of(cm_id, struct cm_id_private, id);
@@ -1203,7 +1199,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask) 
		goto out;

	}



	ret = cm_init_listen(cm_id_priv, service_id, service_mask);

	ret = cm_init_listen(cm_id_priv, service_id, 0);

	if (ret)

		goto out;

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+2 −2
Original line number Diff line number Diff line
@@ -884,8 +884,8 @@ int ipoib_cm_dev_open(struct net_device *dev) 
		goto err_cm;

	}



	ret = ib_cm_listen(priv->cm.id, cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num),

			   0);

	ret = ib_cm_listen(priv->cm.id,

			   cpu_to_be64(IPOIB_CM_IETF_ID | priv->qp->qp_num));

	if (ret) {

		pr_warn("%s: failed to listen on ID 0x%llx\n", priv->ca->name,

			IPOIB_CM_IETF_ID | priv->qp->qp_num);

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −1
Original line number Diff line number Diff line
@@ -3191,7 +3191,7 @@ static int srpt_add_one(struct ib_device *device) 
	 * if this HCA is gone bad and replaced by different HCA

	 */

	ret = sdev->cm_id ?

		ib_cm_listen(sdev->cm_id, cpu_to_be64(srpt_service_guid), 0) :

		ib_cm_listen(sdev->cm_id, cpu_to_be64(srpt_service_guid)) :

		0;

	if (ret < 0) {

		pr_err("ib_cm_listen() failed: %d (cm_id state = %d)\n", ret,

include/rdma/ib_cm.h

+1 −6
Original line number Diff line number Diff line
@@ -340,13 +340,8 @@ void ib_destroy_cm_id(struct ib_cm_id *cm_id); 
 *   and service ID resolution requests.  The service ID should be specified

 *   network-byte order.  If set to IB_CM_ASSIGN_SERVICE_ID, the CM will

 *   assign a service ID to the caller.

 * @service_mask: Mask applied to service ID used to listen across a

 *   range of service IDs.  If set to 0, the service ID is matched

 *   exactly.  This parameter is ignored if %service_id is set to

 *   IB_CM_ASSIGN_SERVICE_ID.

 */

int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id,

		 __be64 service_mask);

int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id);



struct ib_cm_id *ib_cm_insert_listen(struct ib_device *device,

				     ib_cm_handler cm_handler,