RDMA/cm: Delete unused CM ARP functions (ad9efa05) · Commits · 戴 / test

drivers/infiniband/core/cm.c

+0 −66

Original line number	Diff line number	Diff line
		@@ -3163,72 +3163,6 @@ deref: cm_deref_id(cm_id_priv);
		return -EINVAL;
		}

		static void cm_format_apr(struct cm_apr_msg *apr_msg,
		struct cm_id_private *cm_id_priv,
		enum ib_cm_apr_status status,
		void *info,
		u8 info_length,
		const void *private_data,
		u8 private_data_len)
		{
		cm_format_mad_hdr(&apr_msg->hdr, CM_APR_ATTR_ID, cm_id_priv->tid);
		apr_msg->local_comm_id = cm_id_priv->id.local_id;
		apr_msg->remote_comm_id = cm_id_priv->id.remote_id;
		apr_msg->ap_status = (u8) status;

		if (info && info_length) {
		apr_msg->info_length = info_length;
		memcpy(apr_msg->info, info, info_length);
		}

		if (private_data && private_data_len)
		memcpy(apr_msg->private_data, private_data, private_data_len);
		}

		int ib_send_cm_apr(struct ib_cm_id *cm_id,
		enum ib_cm_apr_status status,
		void *info,
		u8 info_length,
		const void *private_data,
		u8 private_data_len)
		{
		struct cm_id_private *cm_id_priv;
		struct ib_mad_send_buf *msg;
		unsigned long flags;
		int ret;

		if ((private_data && private_data_len > IB_CM_APR_PRIVATE_DATA_SIZE) \|\|
		(info && info_length > IB_CM_APR_INFO_LENGTH))
		return -EINVAL;

		cm_id_priv = container_of(cm_id, struct cm_id_private, id);
		spin_lock_irqsave(&cm_id_priv->lock, flags);
		if (cm_id->state != IB_CM_ESTABLISHED \|\|
		(cm_id->lap_state != IB_CM_LAP_RCVD &&
		cm_id->lap_state != IB_CM_MRA_LAP_SENT)) {
		ret = -EINVAL;
		goto out;
		}

		ret = cm_alloc_msg(cm_id_priv, &msg);
		if (ret)
		goto out;

		cm_format_apr((struct cm_apr_msg *) msg->mad, cm_id_priv, status,
		info, info_length, private_data, private_data_len);
		ret = ib_post_send_mad(msg, NULL);
		if (ret) {
		spin_unlock_irqrestore(&cm_id_priv->lock, flags);
		cm_free_msg(msg);
		return ret;
		}

		cm_id->lap_state = IB_CM_LAP_IDLE;
		out: spin_unlock_irqrestore(&cm_id_priv->lock, flags);
		return ret;
		}
		EXPORT_SYMBOL(ib_send_cm_apr);

		static int cm_apr_handler(struct cm_work *work)
		{
		struct cm_id_private *cm_id_priv;

include/rdma/ib_cm.h

+0 −34

Original line number	Diff line number	Diff line
		@@ -499,21 +499,6 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,
		const void *private_data,
		u8 private_data_len);

		/**
		* ib_send_cm_lap - Sends a load alternate path request.
		* @cm_id: Connection identifier associated with the load alternate path
		* message.
		* @alternate_path: A path record that identifies the alternate path to
		* load.
		* @private_data: Optional user-defined private data sent with the
		* load alternate path message.
		* @private_data_len: Size of the private data buffer, in bytes.
		*/
		int ib_send_cm_lap(struct ib_cm_id *cm_id,
		struct sa_path_rec *alternate_path,
		const void *private_data,
		u8 private_data_len);

		/**
		* ib_cm_init_qp_attr - Initializes the QP attributes for use in transitioning
		* to a specified QP state.
		@@ -534,25 +519,6 @@ int ib_cm_init_qp_attr(struct ib_cm_id *cm_id,
		struct ib_qp_attr *qp_attr,
		int *qp_attr_mask);

		/**
		* ib_send_cm_apr - Sends an alternate path response message in response to
		* a load alternate path request.
		* @cm_id: Connection identifier associated with the alternate path response.
		* @status: Reply status sent with the alternate path response.
		* @info: Optional additional information sent with the alternate path
		* response.
		* @info_length: Size of the additional information, in bytes.
		* @private_data: Optional user-defined private data sent with the
		* alternate path response message.
		* @private_data_len: Size of the private data buffer, in bytes.
		*/
		int ib_send_cm_apr(struct ib_cm_id *cm_id,
		enum ib_cm_apr_status status,
		void *info,
		u8 info_length,
		const void *private_data,
		u8 private_data_len);

		struct ib_cm_sidr_req_param {
		struct sa_path_rec *path;
		const struct ib_gid_attr *sgid_attr;

Admin message