diff options
| author |   Erez Zilber <erezz@voltaire.com> | 2007-11-21 13:11:37 +0200 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2007-11-24 13:50:39 -0800 |
| commit | a316b79c3306c59176d7ae04e4aad12374dfed37 (patch) | |
| tree | 59f20bf4fbea3527a531cd1e4c02cc1f2bd7a2b0 /drivers/infiniband/ulp | |
| parent | IB/ehca: Fix static rate regression (diff) | |
| download | linux-dev-a316b79c3306c59176d7ae04e4aad12374dfed37.tar.xz linux-dev-a316b79c3306c59176d7ae04e4aad12374dfed37.zip | |
IB/iser: Add missing counter increment in iser_data_buf_aligned_len()
While adding sg chaining support to iSER, a "for" loop was replaced
with a "for_each_sg" loop. The "for" loop included the incrementation
of 2 variables. Only one of them is incremented in the current
"for_each_sg" loop. This caused iSER to think that all data is
unaligned, and all data was copied to aligned buffers.
This patch increments the missing counter inside the "for_each_sg"
loop whenever necessary.
Signed-off-by: Erez Zilber <erezz@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/iser/iser_memory.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c index d68798061795..4a17743a639f 100644 --- a/drivers/infiniband/ulp/iser/iser_memory.c +++ b/drivers/infiniband/ulp/iser/iser_memory.c @@ -310,13 +310,15 @@ static unsigned int iser_data_buf_aligned_len(struct iser_data_buf *data, if (i + 1 < data->dma_nents) { next_addr = ib_sg_dma_address(ibdev, sg_next(sg)); /* are i, i+1 fragments of the same page? */ - if (end_addr == next_addr) + if (end_addr == next_addr) { + cnt++; continue; - else if (!IS_4K_ALIGNED(end_addr)) { + } else if (!IS_4K_ALIGNED(end_addr)) { ret_len = cnt + 1; break; } } + cnt++; } if (i == data->dma_nents) ret_len = cnt; /* loop ended */ |