Commit 03906ca3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma fixes from Doug Ledford:
 - update MAINTAINERS git repo pointer
 - printk garbage fix
 - fix for qib and iw_cxgb4 bugs introduced in 4.1 window
 - fix for an older iWARP netlink bug
 - fix a memcpy issue in ehca driver

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  infiniband: Remove duplicated KERN_<LEVEL> from pr_<level> uses
  IB/qib: fix test of unsigned variable
  RDMA/core: Fix for parsing netlink string attribute
  MAINTAINERS: update the official rdma git repo
  iw_cxgb4: use wildcard mapping for getting remote addr info
  IB/ehca: use correct destination for memcpy
parents cc49e8c9 f4f01b54

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5054,7 +5054,7 @@ M: Hal Rosenstock <hal.rosenstock@gmail.com> 
L:	linux-rdma@vger.kernel.org

W:	http://www.openfabrics.org/

Q:	http://patchwork.kernel.org/project/linux-rdma/list/

T:	git git://github.com/dledford/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git

S:	Supported

F:	Documentation/infiniband/

F:	drivers/infiniband/

drivers/infiniband/core/iwpm_msg.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


#include "iwpm_util.h"



static const char iwpm_ulib_name[] = "iWarpPortMapperUser";

static const char iwpm_ulib_name[IWPM_ULIBNAME_SIZE] = "iWarpPortMapperUser";

static int iwpm_ulib_version = 3;

static int iwpm_user_pid = IWPM_PID_UNDEFINED;

static atomic_t echo_nlmsg_seq;

drivers/infiniband/hw/cxgb4/cm.c

+8 −8
Original line number Diff line number Diff line
@@ -583,18 +583,18 @@ static void c4iw_record_pm_msg(struct c4iw_ep *ep, 
		sizeof(ep->com.mapped_remote_addr));

}



static int get_remote_addr(struct c4iw_ep *ep)

static int get_remote_addr(struct c4iw_ep *parent_ep, struct c4iw_ep *child_ep)

{

	int ret;



	print_addr(&ep->com, __func__, "get_remote_addr");

	print_addr(&parent_ep->com, __func__, "get_remote_addr parent_ep ");

	print_addr(&child_ep->com, __func__, "get_remote_addr child_ep ");



	ret = iwpm_get_remote_info(&ep->com.mapped_local_addr,

				   &ep->com.mapped_remote_addr,

				   &ep->com.remote_addr, RDMA_NL_C4IW);

	ret = iwpm_get_remote_info(&parent_ep->com.mapped_local_addr,

				   &child_ep->com.mapped_remote_addr,

				   &child_ep->com.remote_addr, RDMA_NL_C4IW);

	if (ret)

		pr_info(MOD "Unable to find remote peer addr info - err %d\n",

			ret);

		PDBG("Unable to find remote peer addr info - err %d\n", ret);



	return ret;

}
@@ -2420,7 +2420,7 @@ static int pass_accept_req(struct c4iw_dev *dev, struct sk_buff *skb) 
	}

	memcpy(&child_ep->com.remote_addr, &child_ep->com.mapped_remote_addr,

	       sizeof(child_ep->com.remote_addr));

	get_remote_addr(child_ep);

	get_remote_addr(parent_ep, child_ep);



	c4iw_get_ep(&parent_ep->com);

	child_ep->parent_ep = parent_ep;

drivers/infiniband/hw/cxgb4/device.c

+2 −2
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ static void recover_lost_dbs(struct uld_ctx *ctx, struct qp_list *qp_list) 
					  t4_sq_host_wq_pidx(&qp->wq),

					  t4_sq_wq_size(&qp->wq));

		if (ret) {

			pr_err(KERN_ERR MOD "%s: Fatal error - "

			pr_err(MOD "%s: Fatal error - "

			       "DB overflow recovery failed - "

			       "error syncing SQ qid %u\n",

			       pci_name(ctx->lldi.pdev), qp->wq.sq.qid);
@@ -1402,7 +1402,7 @@ static void recover_lost_dbs(struct uld_ctx *ctx, struct qp_list *qp_list) 
					  t4_rq_wq_size(&qp->wq));



		if (ret) {

			pr_err(KERN_ERR MOD "%s: Fatal error - "

			pr_err(MOD "%s: Fatal error - "

			       "DB overflow recovery failed - "

			       "error syncing RQ qid %u\n",

			       pci_name(ctx->lldi.pdev), qp->wq.rq.qid);

drivers/infiniband/hw/ehca/ehca_mcast.c

+2 −2
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int ehca_attach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
		return -EINVAL;

	}



	memcpy(&my_gid.raw, gid->raw, sizeof(union ib_gid));

	memcpy(&my_gid, gid->raw, sizeof(union ib_gid));



	subnet_prefix = be64_to_cpu(my_gid.global.subnet_prefix);

	interface_id = be64_to_cpu(my_gid.global.interface_id);
@@ -114,7 +114,7 @@ int ehca_detach_mcast(struct ib_qp *ibqp, union ib_gid *gid, u16 lid) 
		return -EINVAL;

	}



	memcpy(&my_gid.raw, gid->raw, sizeof(union ib_gid));

	memcpy(&my_gid, gid->raw, sizeof(union ib_gid));



	subnet_prefix = be64_to_cpu(my_gid.global.subnet_prefix);

	interface_id = be64_to_cpu(my_gid.global.interface_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE