diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-06-27 12:15:16 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-06-27 12:15:16 -0600 |
| commit | cab598bcef0971f11679b048cc9f502cc8143c88 (patch) | |
| tree | bb8c24c95d1fcafc6c4d642d482eac6aa594d865 /include | |
| parent | 5f75e081ab5cbfbe7aca2112a802e69576ee9778 (diff) | |
| parent | 440e2051c577896275c0e0513ec26964e04c7810 (diff) | |
Merge tag 'nvme-6.10-2024-06-27' of git://git.infradead.org/nvme into block-6.10
Pull NVMe fixes from Keith:
"nvme fixes for Linux 6.10
- Fabrics fixes (Hannes)
- Missing module description (Jeff)
- Clang warning fix (Nathan)"
* tag 'nvme-6.10-2024-06-27' of git://git.infradead.org/nvme:
nvmet-fc: Remove __counted_by from nvmet_fc_tgt_queue.fod[]
nvmet: make 'tsas' attribute idempotent for RDMA
nvme: fixup comment for nvme RDMA Provider Type
nvme-apple: add missing MODULE_DESCRIPTION()
nvmet: do not return 'reserved' for empty TSAS values
nvme: fix NVME_NS_DEAC may incorrectly identifying the disk as EXT_LBA.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 425573202295..c693ac344ec0 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -85,10 +85,11 @@ enum { enum { NVMF_RDMA_QPTYPE_CONNECTED = 1, /* Reliable Connected */ NVMF_RDMA_QPTYPE_DATAGRAM = 2, /* Reliable Datagram */ + NVMF_RDMA_QPTYPE_INVALID = 0xff, }; -/* RDMA QP Service Type codes for Discovery Log Page entry TSAS - * RDMA_QPTYPE field +/* RDMA Provider Type codes for Discovery Log Page entry TSAS + * RDMA_PRTYPE field */ enum { NVMF_RDMA_PRTYPE_NOT_SPECIFIED = 1, /* No Provider Specified */ @@ -110,6 +111,7 @@ enum { NVMF_TCP_SECTYPE_NONE = 0, /* No Security */ NVMF_TCP_SECTYPE_TLS12 = 1, /* TLSv1.2, NVMe-oF 1.1 and NVMe-TCP 3.6.1.1 */ NVMF_TCP_SECTYPE_TLS13 = 2, /* TLSv1.3, NVMe-oF 1.1 and NVMe-TCP 3.6.1.1 */ + NVMF_TCP_SECTYPE_INVALID = 0xff, }; #define NVME_AQ_DEPTH 32 |