lkml.org 
[lkml]   [2007]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/33] qlogicpti: sg chaining support
    Date
    Cc: davem@davemloft.net
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
    ---
    drivers/scsi/qlogicpti.c | 15 ++++++++-------
    1 files changed, 8 insertions(+), 7 deletions(-)

    diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
    index c4195ea..e36e6cd 100644
    --- a/drivers/scsi/qlogicpti.c
    +++ b/drivers/scsi/qlogicpti.c
    @@ -868,7 +868,7 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
    struct qlogicpti *qpti, u_int in_ptr, u_int out_ptr)
    {
    struct dataseg *ds;
    - struct scatterlist *sg;
    + struct scatterlist *sg, *s;
    int i, n;

    if (Cmnd->use_sg) {
    @@ -884,11 +884,12 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
    n = sg_count;
    if (n > 4)
    n = 4;
    - for (i = 0; i < n; i++, sg++) {
    - ds[i].d_base = sg_dma_address(sg);
    - ds[i].d_count = sg_dma_len(sg);
    + for_each_sg(sg, s, n, i) {
    + ds[i].d_base = sg_dma_address(s);
    + ds[i].d_count = sg_dma_len(g);
    }
    sg_count -= 4;
    + sg = s;
    while (sg_count > 0) {
    struct Continuation_Entry *cont;

    @@ -907,9 +908,9 @@ static inline int load_cmd(struct scsi_cmnd *Cmnd, struct Command_Entry *cmd,
    n = sg_count;
    if (n > 7)
    n = 7;
    - for (i = 0; i < n; i++, sg++) {
    - ds[i].d_base = sg_dma_address(sg);
    - ds[i].d_count = sg_dma_len(sg);
    + for_each_sg(sg, s, n, i) {
    + ds[i].d_base = sg_dma_address(s);
    + ds[i].d_count = sg_dma_len(s);
    }
    sg_count -= n;
    }
    --
    1.5.3.rc0.90.gbaa79
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-16 11:59    [W:4.071 / U:0.560 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site