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

Commit 0651ec93 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branches 'cxgb4-2', 'i40iw-2', 'ipoib', 'misc-4.7' and 'mlx5-fcs' into k.o/for-4.7

parents e9bb8af9 ba987e51 78c49f83 e3614bc9 37aa5c36 cff5a0f3

drivers/infiniband/core/cma.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -4295,7 +4295,8 @@ static int __init cma_init(void) 
	if (ret)

	if (ret)

		goto err;

		goto err;





	if (ibnl_add_client(RDMA_NL_RDMA_CM, RDMA_NL_RDMA_CM_NUM_OPS, cma_cb_table))

	if (ibnl_add_client(RDMA_NL_RDMA_CM, ARRAY_SIZE(cma_cb_table),

			    cma_cb_table))

		pr_warn("RDMA CMA: failed to add netlink callback\n");

		pr_warn("RDMA CMA: failed to add netlink callback\n");

	cma_configfs_init();

	cma_configfs_init();

drivers/infiniband/core/iwcm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -459,7 +459,7 @@ static void iw_cm_check_wildcard(struct sockaddr_storage *pm_addr, 
	if (pm_addr->ss_family == AF_INET) {

	if (pm_addr->ss_family == AF_INET) {

		struct sockaddr_in *pm4_addr = (struct sockaddr_in *)pm_addr;

		struct sockaddr_in *pm4_addr = (struct sockaddr_in *)pm_addr;





		if (pm4_addr->sin_addr.s_addr == INADDR_ANY) {

		if (pm4_addr->sin_addr.s_addr == htonl(INADDR_ANY)) {

			struct sockaddr_in *cm4_addr =

			struct sockaddr_in *cm4_addr =

				(struct sockaddr_in *)cm_addr;

				(struct sockaddr_in *)cm_addr;

			struct sockaddr_in *cm4_outaddr =

			struct sockaddr_in *cm4_outaddr =
@@ -1175,7 +1175,7 @@ static int __init iw_cm_init(void) 
	if (ret)

	if (ret)

		pr_err("iw_cm: couldn't init iwpm\n");

		pr_err("iw_cm: couldn't init iwpm\n");





	ret = ibnl_add_client(RDMA_NL_IWCM, RDMA_NL_IWPM_NUM_OPS,

	ret = ibnl_add_client(RDMA_NL_IWCM, ARRAY_SIZE(iwcm_nl_cb_table),

			      iwcm_nl_cb_table);

			      iwcm_nl_cb_table);

	if (ret)

	if (ret)

		pr_err("iw_cm: couldn't register netlink callbacks\n");

		pr_err("iw_cm: couldn't register netlink callbacks\n");

drivers/infiniband/core/iwpm_util.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -634,6 +634,7 @@ static int send_nlmsg_done(struct sk_buff *skb, u8 nl_client, int iwpm_pid) 
	if (!(ibnl_put_msg(skb, &nlh, 0, 0, nl_client,

	if (!(ibnl_put_msg(skb, &nlh, 0, 0, nl_client,

			   RDMA_NL_IWPM_MAPINFO, NLM_F_MULTI))) {

			   RDMA_NL_IWPM_MAPINFO, NLM_F_MULTI))) {

		pr_warn("%s Unable to put NLMSG_DONE\n", __func__);

		pr_warn("%s Unable to put NLMSG_DONE\n", __func__);

		dev_kfree_skb(skb);

		return -ENOMEM;

		return -ENOMEM;

	}

	}

	nlh->nlmsg_type = NLMSG_DONE;

	nlh->nlmsg_type = NLMSG_DONE;

drivers/infiniband/core/netlink.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -151,12 +151,11 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	struct ibnl_client *client;

	struct ibnl_client *client;

	int type = nlh->nlmsg_type;

	int type = nlh->nlmsg_type;

	int index = RDMA_NL_GET_CLIENT(type);

	int index = RDMA_NL_GET_CLIENT(type);

	int op = RDMA_NL_GET_OP(type);

	unsigned int op = RDMA_NL_GET_OP(type);





	list_for_each_entry(client, &client_list, list) {

	list_for_each_entry(client, &client_list, list) {

		if (client->index == index) {

		if (client->index == index) {

			if (op < 0 || op >= client->nops ||

			if (op >= client->nops || !client->cb_table[op].dump)

			    !client->cb_table[op].dump)

				return -EINVAL;

				return -EINVAL;





			/*

			/*

drivers/infiniband/core/sa_query.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ static int ib_nl_send_msg(struct ib_sa_query *query, gfp_t gfp_mask) 
	data = ibnl_put_msg(skb, &nlh, query->seq, 0, RDMA_NL_LS,

	data = ibnl_put_msg(skb, &nlh, query->seq, 0, RDMA_NL_LS,

			    RDMA_NL_LS_OP_RESOLVE, NLM_F_REQUEST);

			    RDMA_NL_LS_OP_RESOLVE, NLM_F_REQUEST);

	if (!data) {

	if (!data) {

		kfree_skb(skb);

		nlmsg_free(skb);

		return -EMSGSIZE;

		return -EMSGSIZE;

	}

	}
@@ -1820,7 +1820,7 @@ static int __init ib_sa_init(void) 
		goto err3;

		goto err3;

	}

	}





	if (ibnl_add_client(RDMA_NL_LS, RDMA_NL_LS_NUM_OPS,

	if (ibnl_add_client(RDMA_NL_LS, ARRAY_SIZE(ib_sa_cb_table),

			    ib_sa_cb_table)) {

			    ib_sa_cb_table)) {

		pr_err("Failed to add netlink callback\n");

		pr_err("Failed to add netlink callback\n");

		ret = -EINVAL;

		ret = -EINVAL;