mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
Changes for 4.1-rc3
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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVUmDlAAoJELgmozMOVy/dfJ4P/3vZIUr7nrbKUF7CWB3kZMrz nkWGg/u+IpLccaYmWwC/15lFDpGxuhE6yEv0wlY9C1q4P4j6Sk2SiPixsGzII2Sq 4zFlrItGFhzHttnTnUujJrFS7gJYZRfa6r3Z1IwevAeP15cTZhCIgxfBpJTQFAin bscwGNXo1qEq0QHnyDIU5/9JwhruRUIwJadymIzsBvVVjJhow3mIIT0rlsKXilmx 6urg4fGVh955kKCIbQxGJPPKR2P+UZMPGWl9Ohua7PfdeO4lIqNXchjxxaJNp6FI MZUsdOw5GxgRLl3k3/1I1KZyAQeW1Kjlg41A0R2uSc8P3PjSeHWsxyMyU+hMPnj/ kPT16+Ghftxn9yUdMESW+vkpNoRGz3glFrg0OlmCXkJTMjJ1MlT8n6NYOfrJY5Cp r5YlqZFl/VP7u3W6wEfFilG3uqig6VJJFwEd2AHB54iiBA0s0wgn+vA3XhP/YRF9 CiEvtCn/MhJkIDPqbpm8fxYC6gNkUWM2EgYbHxXz+/LWn379FT7eSXFZd0BS0OTc 7OxJu93Y/LQIzCDLb64OT73uqFXen84uH3CS/jf1ktgvr/7FDllx5A/v3vY5BZHI xgc4WW6S5RZMZaCPFo4GA6Sg+Z83q1r4Kj8mLEltucMQykvHvGSraAXRMvkmBlD7 mshtwNS/Wsn7EQjnuwYI =NPTK -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
03906ca389
9 changed files with 19 additions and 19 deletions
|
@ -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/
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1569,8 +1569,7 @@ static void reset_gids_task(struct work_struct *work)
|
|||
MLX4_CMD_TIME_CLASS_B,
|
||||
MLX4_CMD_WRAPPED);
|
||||
if (err)
|
||||
pr_warn(KERN_WARNING
|
||||
"set port %d command failed\n", gw->port);
|
||||
pr_warn("set port %d command failed\n", gw->port);
|
||||
}
|
||||
|
||||
mlx4_free_cmd_mailbox(dev, mailbox);
|
||||
|
|
|
@ -1392,7 +1392,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, const struct ib_ah_attr *ah,
|
|||
|
||||
if (ah->ah_flags & IB_AH_GRH) {
|
||||
if (ah->grh.sgid_index >= gen->port[port - 1].gid_table_len) {
|
||||
pr_err(KERN_ERR "sgid_index (%u) too large. max is %d\n",
|
||||
pr_err("sgid_index (%u) too large. max is %d\n",
|
||||
ah->grh.sgid_index, gen->port[port - 1].gid_table_len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
|
|
@ -903,7 +903,7 @@ struct qib_devdata {
|
|||
/* PCI Device ID (here for NodeInfo) */
|
||||
u16 deviceid;
|
||||
/* for write combining settings */
|
||||
unsigned long wc_cookie;
|
||||
int wc_cookie;
|
||||
unsigned long wc_base;
|
||||
unsigned long wc_len;
|
||||
|
||||
|
|
|
@ -118,7 +118,8 @@ int qib_enable_wc(struct qib_devdata *dd)
|
|||
if (!ret) {
|
||||
dd->wc_cookie = arch_phys_wc_add(pioaddr, piolen);
|
||||
if (dd->wc_cookie < 0)
|
||||
ret = -EINVAL;
|
||||
/* use error from routine */
|
||||
ret = dd->wc_cookie;
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
|
Loading…
Reference in a new issue