diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 20:31:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 20:31:41 -0400 |
| commit | a15306365a16380f3bafee9e181ba01231d4acd7 (patch) | |
| tree | c5eb3756235ac7fe4ce540730b8d7480318c5953 /drivers/net | |
| parent | bb896afe2089575ca1bb1fbf3f07b934e1ba999b (diff) | |
| parent | c5057ddccbcb4bf363af628d7963a7475f4114a7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
mlx4_core: Support creation of FMRs with pages smaller than 4K
IB/ehca: Fix function return types
RDMA/cxgb3: Bump up the MPA connection setup timeout.
RDMA/cxgb3: Silently ignore close reply after abort.
RDMA/cxgb3: QP flush fixes
IB/ipoib: Fix transmit queue stalling forever
IB/mlx4: Fix off-by-one errors in calls to mlx4_ib_free_cq_buf()
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/mlx4/mr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index cb46446b2691..03a9abcce524 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c | |||
| @@ -551,7 +551,7 @@ int mlx4_fmr_alloc(struct mlx4_dev *dev, u32 pd, u32 access, int max_pages, | |||
| 551 | u64 mtt_seg; | 551 | u64 mtt_seg; |
| 552 | int err = -ENOMEM; | 552 | int err = -ENOMEM; |
| 553 | 553 | ||
| 554 | if (page_shift < 12 || page_shift >= 32) | 554 | if (page_shift < (ffs(dev->caps.page_size_cap) - 1) || page_shift >= 32) |
| 555 | return -EINVAL; | 555 | return -EINVAL; |
| 556 | 556 | ||
| 557 | /* All MTTs must fit in the same page */ | 557 | /* All MTTs must fit in the same page */ |