xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'nes', 'cxgb4' and 'iwpm' into k.o/for-4.6

Browse Source
This commit is contained in:
Doug Ledford
2016-03-16 13:57:43 -04:00
parent d2ad9cc759 a82268b30a 3021376d6d dafb558717
commit 082eaa5083
23 changed files with 443 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/infiniband/hw/cxgb4/mem.c
View File

@@ -619,12 +619,14 @@ struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd,
int ret = 0;
int length = roundup(max_num_sg * sizeof(u64), 32);
if (mr_type != IB_MR_TYPE_MEM_REG ||
max_num_sg > t4_max_fr_depth(use_dsgl))
return ERR_PTR(-EINVAL);
php = to_c4iw_pd(pd);
rhp = php->rhp;
if (mr_type != IB_MR_TYPE_MEM_REG ||
max_num_sg > t4_max_fr_depth(&rhp->rdev.lldi.ulptx_memwrite_dsgl &&
use_dsgl))
return ERR_PTR(-EINVAL);
mhp = kzalloc(sizeof(*mhp), GFP_KERNEL);
if (!mhp) {
ret = -ENOMEM;