aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 18:39:49 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-30 18:39:49 -0400
commit93fdf10d4c28edaa1b9f80e7f9c3002359186d00 (patch)
tree4c5700b7f647470dcbb3b2a0531529ba35531b3d /drivers
parent22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (diff)
parent0d8fdfd71bc871ffc07fe4429db8d4934185a8ec (diff)
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband: IB/core: Set alternate port number when initializing QP attributes IB/uverbs: Set correct user handle for user SRQs
Diffstat (limited to 'drivers')
-rw-r--r--drivers/infiniband/core/cm.c1
-rw-r--r--drivers/infiniband/core/uverbs_cmd.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 450adfe0a4f1..3f6705f3083a 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -3152,6 +3152,7 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv,
3152 } 3152 }
3153 if (cm_id_priv->alt_av.ah_attr.dlid) { 3153 if (cm_id_priv->alt_av.ah_attr.dlid) {
3154 *qp_attr_mask |= IB_QP_ALT_PATH; 3154 *qp_attr_mask |= IB_QP_ALT_PATH;
3155 qp_attr->alt_port_num = cm_id_priv->alt_av.port->port_num;
3155 qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr; 3156 qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr;
3156 } 3157 }
3157 ret = 0; 3158 ret = 0;
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index a908a7bdcd7f..bdf5d5098190 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1963,7 +1963,7 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file,
1963 if (!obj) 1963 if (!obj)
1964 return -ENOMEM; 1964 return -ENOMEM;
1965 1965
1966 init_uobj(&obj->uobject, 0, file->ucontext); 1966 init_uobj(&obj->uobject, cmd.user_handle, file->ucontext);
1967 down_write(&obj->uobject.mutex); 1967 down_write(&obj->uobject.mutex);
1968 1968
1969 pd = idr_read_pd(cmd.pd_handle, file->ucontext); 1969 pd = idr_read_pd(cmd.pd_handle, file->ucontext);