aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Gurtovoy <maxg@mellanox.com>2018-05-31 04:05:25 -0400
committerJason Gunthorpe <jgg@mellanox.com>2018-06-04 11:19:24 -0400
commitc6c2c03a665af99785341eb0481f4170942890d2 (patch)
tree98c6c574dc8b3e22acae50c684dd74d37860237b
parentca24da008fd665db125aed889e857ccaa033de84 (diff)
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>
-rw-r--r--drivers/infiniband/ulp/iser/iscsi_iser.h4
-rw-r--r--drivers/infiniband/ulp/iser/iser_memory.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index c30ceb08db21..120b40829560 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -383,10 +383,6 @@ struct iser_device {
383 bool remote_inv_sup; 383 bool remote_inv_sup;
384}; 384};
385 385
386#define ISER_CHECK_GUARD 0xc0
387#define ISER_CHECK_REFTAG 0x0f
388#define ISER_CHECK_APPTAG 0x30
389
390/** 386/**
391 * struct iser_reg_resources - Fast registration recources 387 * struct iser_reg_resources - Fast registration recources
392 * 388 *
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 322209d5ff58..ca844a926e6a 100644
--- 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)
362{ 362{
363 *mask = 0; 363 *mask = 0;
364 if (sc->prot_flags & SCSI_PROT_REF_CHECK) 364 if (sc->prot_flags & SCSI_PROT_REF_CHECK)
365 *mask |= ISER_CHECK_REFTAG; 365 *mask |= IB_SIG_CHECK_REFTAG;
366 if (sc->prot_flags & SCSI_PROT_GUARD_CHECK) 366 if (sc->prot_flags & SCSI_PROT_GUARD_CHECK)
367 *mask |= ISER_CHECK_GUARD; 367 *mask |= IB_SIG_CHECK_GUARD;
368} 368}
369 369
370static inline void 370static inline void