From cf22f5d38313f322a5c9b68632d35ddf5078ba84 Mon Sep 17 00:00:00 2001 From: Jayamohan Kallickal Date: Thu, 7 Jan 2010 01:50:19 +0530 Subject: [PATCH] --- yaml --- r: 181287 b: refs/heads/master c: 48bd86cf213a5780346b603b703c4b83978611a8 h: refs/heads/master i: 181285: aacf27bc486b261cbe25c91a63d30348495b6668 181283: 8da8c98683a338f3f6c2113f6607694fe177bc9e 181279: 2d3e81dd5bad3d248acd42eba7596dd199312991 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/be2iscsi/be_main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac3e8dfa3fc4..ae58342bbc04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4b8972c6172950ce226afdf7a921098f7672d5c +refs/heads/master: 48bd86cf213a5780346b603b703c4b83978611a8 diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/drivers/scsi/be2iscsi/be_main.c index 9fc4446b21e0..d611a13dabf0 100644 --- a/trunk/drivers/scsi/be2iscsi/be_main.c +++ b/trunk/drivers/scsi/be2iscsi/be_main.c @@ -1711,7 +1711,8 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg, io_task->bhs_pa.u.a32.address_hi); l_sg = sg; - for (index = 0; (index < num_sg) && (index < 2); index++, sg_next(sg)) { + for (index = 0; (index < num_sg) && (index < 2); index++, + sg = sg_next(sg)) { if (index == 0) { sg_len = sg_dma_len(sg); addr = (u64) sg_dma_address(sg); @@ -1755,7 +1756,7 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg, psgl++; psgl++; offset = 0; - for (index = 0; index < num_sg; index++, sg_next(sg), psgl++) { + for (index = 0; index < num_sg; index++, sg = sg_next(sg), psgl++) { sg_len = sg_dma_len(sg); addr = (u64) sg_dma_address(sg); AMAP_SET_BITS(struct amap_iscsi_sge, addr_lo, psgl,