diff options
| author |   Doug Ledford <dledford@redhat.com> | 2017-08-18 14:12:04 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 14:12:04 -0400 |
| commit | b0e32e20e3c63778d8c20a40d8bec8b18baffecb (patch) | |
| tree | 2e0c3311c53889473b94d49132fe5b7cdee71d51 /drivers/infiniband/hw/i40iw/i40iw_puda.c | |
| parent | Merge branch 'misc' into k.o/for-next (diff) | |
| parent | IB/uverbs: Fix NULL pointer dereference during device removal (diff) | |
| download | linux-dev-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.tar.xz linux-dev-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.zip | |
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/i40iw/i40iw_puda.c')
| -rw-r--r-- | drivers/infiniband/hw/i40iw/i40iw_puda.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/i40iw/i40iw_puda.c b/drivers/infiniband/hw/i40iw/i40iw_puda.c index 40c3137a7325..c2cab20c4bc5 100644 --- a/drivers/infiniband/hw/i40iw/i40iw_puda.c +++ b/drivers/infiniband/hw/i40iw/i40iw_puda.c @@ -685,7 +685,7 @@ static enum i40iw_status_code i40iw_puda_cq_create(struct i40iw_puda_rsrc *rsrc) cqsize = rsrc->cq_size * (sizeof(struct i40iw_cqe)); tsize = cqsize + sizeof(struct i40iw_cq_shadow_area); ret = i40iw_allocate_dma_mem(dev->hw, &rsrc->cqmem, tsize, - I40IW_CQ0_ALIGNMENT_MASK); + I40IW_CQ0_ALIGNMENT); if (ret) return ret; |