| Message ID | 1512765269-145929-2-git-send-email-henry.orosco@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
On Fri, Dec 08, 2017 at 02:34:28PM -0600, Henry Orosco wrote: > From: Chien Tin Tung <chien.tin.tung@intel.com> > > Use sqsize instead of I40IW_CQP_SW_SQSIZE_2048 to initialize > cqp_requests elements in the for-loop as sqsize is used > to allocate memory for cqp_requests. > > Signed-off-by: Chien Tin Tung <chien.tin.tung@intel.com> > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> > drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to for-next, thanks There was a 3rd patch about the 'bool' change that now cross depends with for-next and for-rc. I think you have to re-spin that one against for-rc as there is another usage of 'accelerated' added there? Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 11, 2017 at 04:41:08PM -0700, Jason Gunthorpe wrote: > On Fri, Dec 08, 2017 at 02:34:28PM -0600, Henry Orosco wrote: > > From: Chien Tin Tung <chien.tin.tung@intel.com> > > > > Use sqsize instead of I40IW_CQP_SW_SQSIZE_2048 to initialize > > cqp_requests elements in the for-loop as sqsize is used > > to allocate memory for cqp_requests. > > > > Signed-off-by: Chien Tin Tung <chien.tin.tung@intel.com> > > Signed-off-by: Shiraz Saleem <shiraz.saleem@intel.com> > > drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Applied to for-next, thanks > > There was a 3rd patch about the 'bool' change that now cross depends > with for-next and for-rc. I think you have to re-spin that one against > for-rc as there is another usage of 'accelerated' added there? > Hi Jason - I sent an updated ver. of this patch "i40iw: Change accelerated flag to bool" against the for-rc branch. Shiraz -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/infiniband/hw/i40iw/i40iw_main.c b/drivers/infiniband/hw/i40iw/i40iw_main.c index e824296..1f9d9c7 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_main.c +++ b/drivers/infiniband/hw/i40iw/i40iw_main.c @@ -607,7 +607,7 @@ static enum i40iw_status_code i40iw_create_cqp(struct i40iw_device *iwdev) INIT_LIST_HEAD(&cqp->cqp_avail_reqs); INIT_LIST_HEAD(&cqp->cqp_pending_reqs); /* init the waitq of the cqp_requests and add them to the list */ - for (i = 0; i < I40IW_CQP_SW_SQSIZE_2048; i++) { + for (i = 0; i < sqsize; i++) { init_waitqueue_head(&cqp->cqp_requests[i].waitq); list_add_tail(&cqp->cqp_requests[i].list, &cqp->cqp_avail_reqs); }