The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=73151e4d92302c316dae126943e929c48a9df64e
commit 73151e4d92302c316dae126943e929c48a9df64e Author: Shamir Rabinovitch <[email protected]> AuthorDate: 2019-02-07 16:44:49 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2026-09-15 14:22:39 +0000 iw_cxgbe: Cleanups to ucontext handling when creating queues Obtained from: Linux commit e00b64f7c54c4cbd88143bbd43e7c3d61a090e5c Obtained from: Linux commit 89944450547334aa6655e0cd4aec8df1897a205a --- sys/dev/cxgbe/iw_cxgbe/qp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/qp.c b/sys/dev/cxgbe/iw_cxgbe/qp.c index 0f9466089beb..931a5be7c54e 100644 --- a/sys/dev/cxgbe/iw_cxgbe/qp.c +++ b/sys/dev/cxgbe/iw_cxgbe/qp.c @@ -1954,7 +1954,8 @@ c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, struct c4iw_cq *rchp; struct c4iw_create_qp_resp uresp; unsigned int sqsize, rqsize; - struct c4iw_ucontext *ucontext; + struct c4iw_ucontext *ucontext = rdma_udata_to_drv_context( + udata, struct c4iw_ucontext, ibucontext); int ret; struct c4iw_mm_entry *sq_key_mm = NULL, *rq_key_mm = NULL; struct c4iw_mm_entry *sq_db_key_mm = NULL, *rq_db_key_mm = NULL; @@ -1986,8 +1987,6 @@ c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs, if (sqsize < 8) sqsize = 8; - ucontext = pd->uobject ? to_c4iw_ucontext(pd->uobject->context) : NULL; - qhp = kzalloc(sizeof(*qhp), GFP_KERNEL); if (!qhp) return ERR_PTR(-ENOMEM);
