IB/iser: use T10-PI check mask definitions from core layer

No reason to re-define protection information check in ib_iser driver.
Use check masks from RDMA core driver.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index c30ceb08db214d20a36a1c626be7e6cfd5cae262..120b408295603d31cccceeffaeea9b7ee4778540 100644 (file)
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -383,10 +383,6 @@ struct iser_device {
        bool                         remote_inv_sup;
 };
 
-#define ISER_CHECK_GUARD       0xc0
-#define ISER_CHECK_REFTAG      0x0f
-#define ISER_CHECK_APPTAG      0x30
-
 /**
  * struct iser_reg_resources - Fast registration recources
  *

diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 322209d5ff5829b6dfd5f4de54f4d11fe141c63d..ca844a926e6add96b8063a698304a50fa7a8ffa7 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -362,9 +362,9 @@ iser_set_prot_checks(struct scsi_cmnd *sc, u8 *mask)
 {
        *mask = 0;
        if (sc->prot_flags & SCSI_PROT_REF_CHECK)
-               *mask |= ISER_CHECK_REFTAG;
+               *mask |= IB_SIG_CHECK_REFTAG;
        if (sc->prot_flags & SCSI_PROT_GUARD_CHECK)
-               *mask |= ISER_CHECK_GUARD;
+               *mask |= IB_SIG_CHECK_GUARD;
 }
 
 static inline void