Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / lpfc / lpfc_scsi.c

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index bf879d8..c0038ea 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2017-2023 Broadcom. All Rights Reserved. The term *
+ * Copyright (C) 2017-2024 Broadcom. All Rights Reserved. The term *
  * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.     *
  * Copyright (C) 2004-2016 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
@@ -2728,14 +2728,14 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_io_buf *lpfc_cmd)
                sgde = scsi_sglist(cmd);
                blksize = scsi_prot_interval(cmd);
                data_src = (uint8_t *)sg_virt(sgde);
-               data_len = sgde->length;
+               data_len = sg_dma_len(sgde);
                if ((data_len & (blksize - 1)) == 0)
                        chk_guard = 1;
 
                src = (struct scsi_dif_tuple *)sg_virt(sgpe);
                start_ref_tag = scsi_prot_ref_tag(cmd);
                start_app_tag = src->app_tag;
-               len = sgpe->length;
+               len = sg_dma_len(sgpe);
                while (src && protsegcnt) {
                        while (len) {
 
@@ -2800,7 +2800,7 @@ skipit:
                                                goto out;
 
                                        data_src = (uint8_t *)sg_virt(sgde);
-                                       data_len = sgde->length;
+                                       data_len = sg_dma_len(sgde);
                                        if ((data_len & (blksize - 1)) == 0)
                                                chk_guard = 1;
                                }
@@ -2810,7 +2810,7 @@ skipit:
                        sgpe = sg_next(sgpe);
                        if (sgpe) {
                                src = (struct scsi_dif_tuple *)sg_virt(sgpe);
-                               len = sgpe->length;
+                               len = sg_dma_len(sgpe);
                        } else {
                                src = NULL;
                        }