From baf523b5d8a4360b02790443b1e96bff88b1997b Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 15 Jul 2016 09:46:20 -0700 Subject: [PATCH] nvmf: add _subtype to TSAS structures Fix the naming to match the spec. Change-Id: I5e2fba54c796f8d1f11d61fb3d131aabc5c90503 Signed-off-by: Daniel Verkamp --- include/spdk/nvmf_spec.h | 13 +++++++------ lib/nvmf/port.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/spdk/nvmf_spec.h b/include/spdk/nvmf_spec.h index 60098e294..b5b870197 100644 --- a/include/spdk/nvmf_spec.h +++ b/include/spdk/nvmf_spec.h @@ -353,7 +353,7 @@ struct spdk_nvmf_discovery_identify_data { }; SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_discovery_identify_data) == 4096, "Incorrect size"); -struct spdk_nvmf_rdma_transport_specific_address { +struct spdk_nvmf_rdma_transport_specific_address_subtype { uint8_t rdma_qptype; /* see spdk_nvmf_rdma_qp_service_types */ uint8_t rdma_prtype; /* see spdk_nvmf_rdma_provider_types */ uint8_t rdma_cms; /* see spdk_nvmf_rdma_connection_mgmt_service */ @@ -361,14 +361,15 @@ struct spdk_nvmf_rdma_transport_specific_address { uint16_t rdma_pkey; uint8_t reserved2[246]; }; -SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_rdma_transport_specific_address) == 256, +SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_rdma_transport_specific_address_subtype) == 256, "Incorrect size"); -union spdk_nvmf_transport_specific_address { +union spdk_nvmf_transport_specific_address_subtype { uint8_t raw[256]; - struct spdk_nvmf_rdma_transport_specific_address rdma; + struct spdk_nvmf_rdma_transport_specific_address_subtype rdma; }; -SPDK_STATIC_ASSERT(sizeof(union spdk_nvmf_transport_specific_address) == 256, "Incorrect size"); +SPDK_STATIC_ASSERT(sizeof(union spdk_nvmf_transport_specific_address_subtype) == 256, + "Incorrect size"); struct spdk_nvmf_discovery_log_page_entry { uint8_t trtype; /* transport type */ @@ -382,7 +383,7 @@ struct spdk_nvmf_discovery_log_page_entry { uint8_t reserved1[192]; uint8_t subnqn[256]; uint8_t traddr[256]; - union spdk_nvmf_transport_specific_address tsas; + union spdk_nvmf_transport_specific_address_subtype tsas; }; SPDK_STATIC_ASSERT(sizeof(struct spdk_nvmf_discovery_log_page_entry) == 1024, "Incorrect size"); diff --git a/lib/nvmf/port.h b/lib/nvmf/port.h index fc6ec2069..da1ec769e 100644 --- a/lib/nvmf/port.h +++ b/lib/nvmf/port.h @@ -70,7 +70,7 @@ struct spdk_nvmf_fabric_intf { struct spdk_nvmf_port { int tag; enum group_state state; - union spdk_nvmf_transport_specific_address tsas; + union spdk_nvmf_transport_specific_address_subtype tsas; TAILQ_HEAD(, spdk_nvmf_fabric_intf) head; TAILQ_ENTRY(spdk_nvmf_port) tailq; };