diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 08:28:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 08:28:46 -0800 |
| commit | 5ad587283cc15f71bb0e9cb9e0933dd8ebd66e1c (patch) | |
| tree | 743564a6e48fa6bc3667ca01d9d12452ebbcffcf /drivers/infiniband/hw/cxgb3/iwch_mem.c | |
| parent | f511d7edf53bd49c16131fce28b87428c16239ad (diff) | |
| parent | 030f1b2f5d880c1ad3d7e0b71fc383f00f38f8f7 (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:
MAINTAINERS: neteffect update
RDMA/nes: Fix interrupt moderation low threshold
RDMA/nes: Fix CRC endianness for RDMA connection establishment on big-endian
RDMA/nes: Fix use-after-free in mini_cm_dec_refcnt_listen()
RDMA/nes: Fix use-after-free in nes_create_cq()
RDMA/nes: Fix a check-after-use in nes_probe()
RDMA/nes: Fix a memory leak in schedule_nes_timer()
RDMA/nes: Fix off-by-one
RDMA/nes: Resurrect error path dead code
RDMA/cxgb3: Fix shift calc in build_phys_page_list() for 1-entry page lists
Diffstat (limited to 'drivers/infiniband/hw/cxgb3/iwch_mem.c')
| -rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_mem.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_mem.c b/drivers/infiniband/hw/cxgb3/iwch_mem.c index 73bfd1656f8..b8797c66676 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_mem.c +++ b/drivers/infiniband/hw/cxgb3/iwch_mem.c @@ -136,14 +136,8 @@ int build_phys_page_list(struct ib_phys_buf *buffer_list, /* Find largest page shift we can use to cover buffers */ for (*shift = PAGE_SHIFT; *shift < 27; ++(*shift)) - if (num_phys_buf > 1) { - if ((1ULL << *shift) & mask) - break; - } else - if (1ULL << *shift >= - buffer_list[0].size + - (buffer_list[0].addr & ((1ULL << *shift) - 1))) - break; + if ((1ULL << *shift) & mask) + break; buffer_list[0].size += buffer_list[0].addr & ((1ULL << *shift) - 1); buffer_list[0].addr &= ~0ull << *shift; |