Commit 754137a7 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'for-next-early' into for-next 



The early for-next branch was based on v4.14-rc2, while the shared pull
request I got from Mellanox used a v4.14-rc4 base.  I'm making the
branch that was the shared Mellanox pull request the new for-next branch
and merging the early for-next branch into it.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents e980b441 4c532d6c

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -11081,6 +11081,7 @@ F: drivers/net/ethernet/qlogic/qede/ 


QLOGIC QL4xxx RDMA DRIVER

M:	Ram Amrani <Ram.Amrani@cavium.com>

M:	Michal Kalderon <Michal.Kalderon@cavium.com>

M:	Ariel Elior <Ariel.Elior@cavium.com>

L:	linux-rdma@vger.kernel.org

S:	Supported

drivers/infiniband/Kconfig

+1 −1
Original line number Diff line number Diff line 
menuconfig INFINIBAND

	tristate "InfiniBand support"

	depends on PCI || BROKEN

	depends on HAS_IOMEM

	depends on NET

	depends on INET
@@ -46,6 +45,7 @@ config INFINIBAND_EXP_USER_ACCESS 
config INFINIBAND_USER_MEM

	bool

	depends on INFINIBAND_USER_ACCESS != n

	depends on MMU

	default y



config INFINIBAND_ON_DEMAND_PAGING

drivers/infiniband/core/cm.c

+13 −14
Original line number Diff line number Diff line
@@ -1472,31 +1472,29 @@ static void cm_format_path_lid_from_req(struct cm_req_msg *req_msg, 


	if (primary_path->rec_type != SA_PATH_REC_TYPE_OPA) {

		sa_path_set_dlid(primary_path,

				 htonl(ntohs(req_msg->primary_local_lid)));

				 ntohs(req_msg->primary_local_lid));

		sa_path_set_slid(primary_path,

				 htonl(ntohs(req_msg->primary_remote_lid)));

				 ntohs(req_msg->primary_remote_lid));

	} else {

		lid = opa_get_lid_from_gid(&req_msg->primary_local_gid);

		sa_path_set_dlid(primary_path, cpu_to_be32(lid));

		sa_path_set_dlid(primary_path, lid);



		lid = opa_get_lid_from_gid(&req_msg->primary_remote_gid);

		sa_path_set_slid(primary_path, cpu_to_be32(lid));

		sa_path_set_slid(primary_path, lid);

	}



	if (!cm_req_has_alt_path(req_msg))

		return;



	if (alt_path->rec_type != SA_PATH_REC_TYPE_OPA) {

		sa_path_set_dlid(alt_path,

				 htonl(ntohs(req_msg->alt_local_lid)));

		sa_path_set_slid(alt_path,

				 htonl(ntohs(req_msg->alt_remote_lid)));

		sa_path_set_dlid(alt_path, ntohs(req_msg->alt_local_lid));

		sa_path_set_slid(alt_path, ntohs(req_msg->alt_remote_lid));

	} else {

		lid = opa_get_lid_from_gid(&req_msg->alt_local_gid);

		sa_path_set_dlid(alt_path, cpu_to_be32(lid));

		sa_path_set_dlid(alt_path, lid);



		lid = opa_get_lid_from_gid(&req_msg->alt_remote_gid);

		sa_path_set_slid(alt_path, cpu_to_be32(lid));

		sa_path_set_slid(alt_path, lid);

	}

}
@@ -2810,6 +2808,7 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id, 
			msg_response = CM_MSG_RESPONSE_OTHER;

			break;

		}

		/* fall through */

	default:

		ret = -EINVAL;

		goto error1;
@@ -3037,14 +3036,14 @@ static void cm_format_path_lid_from_lap(struct cm_lap_msg *lap_msg, 
	u32 lid;



	if (path->rec_type != SA_PATH_REC_TYPE_OPA) {

		sa_path_set_dlid(path, htonl(ntohs(lap_msg->alt_local_lid)));

		sa_path_set_slid(path, htonl(ntohs(lap_msg->alt_remote_lid)));

		sa_path_set_dlid(path, ntohs(lap_msg->alt_local_lid));

		sa_path_set_slid(path, ntohs(lap_msg->alt_remote_lid));

	} else {

		lid = opa_get_lid_from_gid(&lap_msg->alt_local_gid);

		sa_path_set_dlid(path, cpu_to_be32(lid));

		sa_path_set_dlid(path, lid);



		lid = opa_get_lid_from_gid(&lap_msg->alt_remote_gid);

		sa_path_set_slid(path, cpu_to_be32(lid));

		sa_path_set_slid(path, lid);

	}

}

drivers/infiniband/core/cma.c

+7 −4
Original line number Diff line number Diff line
@@ -1540,7 +1540,7 @@ static struct rdma_id_private *cma_id_from_event(struct ib_cm_id *cm_id, 
	return id_priv;

}



static inline int cma_user_data_offset(struct rdma_id_private *id_priv)

static inline u8 cma_user_data_offset(struct rdma_id_private *id_priv)

{

	return cma_family(id_priv) == AF_IB ? 0 : sizeof(struct cma_hdr);

}
@@ -1942,7 +1942,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event) 
	struct rdma_id_private *listen_id, *conn_id = NULL;

	struct rdma_cm_event event;

	struct net_device *net_dev;

	int offset, ret;

	u8 offset;

	int ret;



	listen_id = cma_id_from_event(cm_id, ib_event, &net_dev);

	if (IS_ERR(listen_id))
@@ -3440,7 +3441,8 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv, 
	struct ib_cm_sidr_req_param req;

	struct ib_cm_id	*id;

	void *private_data;

	int offset, ret;

	u8 offset;

	int ret;



	memset(&req, 0, sizeof req);

	offset = cma_user_data_offset(id_priv);
@@ -3497,7 +3499,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv, 
	struct rdma_route *route;

	void *private_data;

	struct ib_cm_id	*id;

	int offset, ret;

	u8 offset;

	int ret;



	memset(&req, 0, sizeof req);

	offset = cma_user_data_offset(id_priv);

drivers/infiniband/core/iwcm.c

+0 −3
Original line number Diff line number Diff line
@@ -447,9 +447,6 @@ static void destroy_cm_id(struct iw_cm_id *cm_id) 
 */

void iw_destroy_cm_id(struct iw_cm_id *cm_id)

{

	struct iwcm_id_private *cm_id_priv;



	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);

	destroy_cm_id(cm_id);

}

EXPORT_SYMBOL(iw_destroy_cm_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE