diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/ulp/iser/iser_initiator.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/ulp/iser/iser_memory.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c index 9b3d79c796c8..e73c87b9be43 100644 --- a/drivers/infiniband/ulp/iser/iser_initiator.c +++ b/drivers/infiniband/ulp/iser/iser_initiator.c | |||
@@ -487,10 +487,8 @@ int iser_send_control(struct iscsi_conn *conn, | |||
487 | struct iscsi_iser_conn *iser_conn = conn->dd_data; | 487 | struct iscsi_iser_conn *iser_conn = conn->dd_data; |
488 | struct iser_desc *mdesc = mtask->dd_data; | 488 | struct iser_desc *mdesc = mtask->dd_data; |
489 | struct iser_dto *send_dto = NULL; | 489 | struct iser_dto *send_dto = NULL; |
490 | unsigned int itt; | ||
491 | unsigned long data_seg_len; | 490 | unsigned long data_seg_len; |
492 | int err = 0; | 491 | int err = 0; |
493 | unsigned char opcode; | ||
494 | struct iser_regd_buf *regd_buf; | 492 | struct iser_regd_buf *regd_buf; |
495 | struct iser_device *device; | 493 | struct iser_device *device; |
496 | 494 | ||
@@ -512,8 +510,6 @@ int iser_send_control(struct iscsi_conn *conn, | |||
512 | 510 | ||
513 | iser_reg_single(device, send_dto->regd[0], DMA_TO_DEVICE); | 511 | iser_reg_single(device, send_dto->regd[0], DMA_TO_DEVICE); |
514 | 512 | ||
515 | itt = ntohl(mtask->hdr->itt); | ||
516 | opcode = mtask->hdr->opcode & ISCSI_OPCODE_MASK; | ||
517 | data_seg_len = ntoh24(mtask->hdr->dlength); | 513 | data_seg_len = ntoh24(mtask->hdr->dlength); |
518 | 514 | ||
519 | if (data_seg_len > 0) { | 515 | if (data_seg_len > 0) { |
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c index 3aedd59b8a84..86b6915cb9c7 100644 --- a/drivers/infiniband/ulp/iser/iser_memory.c +++ b/drivers/infiniband/ulp/iser/iser_memory.c | |||
@@ -235,7 +235,7 @@ static int iser_sg_to_page_vec(struct iser_data_buf *data, | |||
235 | { | 235 | { |
236 | struct scatterlist *sg = (struct scatterlist *)data->buf; | 236 | struct scatterlist *sg = (struct scatterlist *)data->buf; |
237 | dma_addr_t first_addr, last_addr, page; | 237 | dma_addr_t first_addr, last_addr, page; |
238 | int start_aligned, end_aligned; | 238 | int end_aligned; |
239 | unsigned int cur_page = 0; | 239 | unsigned int cur_page = 0; |
240 | unsigned long total_sz = 0; | 240 | unsigned long total_sz = 0; |
241 | int i; | 241 | int i; |
@@ -249,7 +249,6 @@ static int iser_sg_to_page_vec(struct iser_data_buf *data, | |||
249 | first_addr = sg_dma_address(&sg[i]); | 249 | first_addr = sg_dma_address(&sg[i]); |
250 | last_addr = first_addr + sg_dma_len(&sg[i]); | 250 | last_addr = first_addr + sg_dma_len(&sg[i]); |
251 | 251 | ||
252 | start_aligned = !(first_addr & ~MASK_4K); | ||
253 | end_aligned = !(last_addr & ~MASK_4K); | 252 | end_aligned = !(last_addr & ~MASK_4K); |
254 | 253 | ||
255 | /* continue to collect page fragments till aligned or SG ends */ | 254 | /* continue to collect page fragments till aligned or SG ends */ |