The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=63786b0a06bb6bc20c73c96e21e25c5e46746e6f
commit 63786b0a06bb6bc20c73c96e21e25c5e46746e6f Author: Leon Romanovsky <[email protected]> AuthorDate: 2019-05-28 11:37:28 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2026-09-15 14:22:40 +0000 iw_cxgbe: Remove unused return value from destroy_cq Part of the original Linux commit was already applied during a prior OFED update in commit b633e08c705fe43180567eae26923d6f6f98c8d9, but this portion of the changes to the Linux iw_cxgb4 driver were not included. Obtained from: Linux commit a52c8e2469c30cf7ac453d624aed9c168b23d1af --- sys/dev/cxgbe/iw_cxgbe/cq.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/dev/cxgbe/iw_cxgbe/cq.c b/sys/dev/cxgbe/iw_cxgbe/cq.c index 3e5052d3a6cc..2bc5f0812ac5 100644 --- a/sys/dev/cxgbe/iw_cxgbe/cq.c +++ b/sys/dev/cxgbe/iw_cxgbe/cq.c @@ -49,21 +49,21 @@ #include "iw_cxgbe.h" #include "user.h" -static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, - struct c4iw_dev_ucontext *uctx, - struct c4iw_wr_wait *wr_waitp) +static void destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, + struct c4iw_dev_ucontext *uctx, + struct c4iw_wr_wait *wr_waitp) { struct adapter *sc = rdev->adap; struct c4iw_dev *rhp = rdev_to_c4iw_dev(rdev); struct fw_ri_res_wr *res_wr; struct fw_ri_res *res; - int ret, wr_len; + int wr_len; struct wrqe *wr; wr_len = sizeof *res_wr + sizeof *res; wr = alloc_wrqe(wr_len, &sc->sge.ctrlq[0]); - if (wr == NULL) - return (0); + if (wr == NULL) + return; res_wr = wrtod(wr); memset(res_wr, 0, wr_len); res_wr->op_nres = cpu_to_be32( @@ -78,14 +78,13 @@ static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq, res->u.cq.iqid = cpu_to_be32(cq->cqid); c4iw_init_wr_wait(wr_waitp); - ret = c4iw_ref_send_wait(rdev, wr, wr_waitp, 0, 0, NULL, __func__); + c4iw_ref_send_wait(rdev, wr, wr_waitp, 0, 0, NULL, __func__); kfree(cq->sw_queue); dma_free_coherent(rhp->ibdev.dma_device, cq->memsize, cq->queue, dma_unmap_addr(cq, mapping)); c4iw_put_cqid(rdev, cq->cqid, uctx); - return ret; } static int
