Commit 0e1dc05e authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: move TSAS to fabric_intf 



It can be different per fabric interface within a single port.

Change-Id: If13590d7f12291499ccfd705efaf6d2b1b1d7003
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent baf523b5

lib/nvmf/port.c

+3 −4
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ spdk_nvmf_fabric_intf_create(char *host, char *sin_port) 
	fabric_intf->trtype = SPDK_NVMF_TRANS_RDMA;

	fabric_intf->adrfam = SPDK_NVMF_ADDR_FAMILY_IPV4;

	fabric_intf->treq = SPDK_NVMF_TREQ_NOT_SPECIFIED;

	fabric_intf->tsas.rdma.rdma_qptype = SPDK_NVMF_QP_TYPE_RELIABLE_CONNECTED;

	fabric_intf->tsas.rdma.rdma_prtype = SPDK_NVMF_RDMA_NO_PROVIDER;

	fabric_intf->tsas.rdma.rdma_cms = SPDK_NVMF_RDMA_CMS_RDMA_CM;



	return fabric_intf;

}
@@ -126,10 +129,6 @@ spdk_nvmf_port_create(int tag) 


	port->state = GROUP_INIT;

	port->tag = tag;

	port->tsas.rdma.rdma_qptype = SPDK_NVMF_QP_TYPE_RELIABLE_CONNECTED;

	/* No provider specified */

	port->tsas.rdma.rdma_prtype = SPDK_NVMF_RDMA_NO_PROVIDER;

	port->tsas.rdma.rdma_cms = SPDK_NVMF_RDMA_CMS_RDMA_CM;



	TAILQ_INIT(&port->head);

lib/nvmf/port.h

+1 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct spdk_nvmf_fabric_intf { 
	enum spdk_nvmf_transport_types		trtype;

	enum spdk_nvmf_address_family_types	adrfam;

	enum spdk_nvmf_transport_requirements	treq;

	union spdk_nvmf_transport_specific_address_subtype	tsas;

	uint32_t				num_sessions;

	TAILQ_ENTRY(spdk_nvmf_fabric_intf)	tailq;

};
@@ -70,7 +71,6 @@ struct spdk_nvmf_fabric_intf { 
struct spdk_nvmf_port {

	int tag;

	enum group_state state;

	union spdk_nvmf_transport_specific_address_subtype	tsas;

	TAILQ_HEAD(, spdk_nvmf_fabric_intf)	head;

	TAILQ_ENTRY(spdk_nvmf_port)		tailq;

};

lib/nvmf/subsystem.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ spdk_format_discovery_log(struct spdk_nvmf_discovery_log_page *disc_log, uint32_ 
						snprintf(entry->trsvcid, 32, "%s", fabric_intf->sin_port);

						snprintf(entry->traddr, 256, "%s", fabric_intf->host);

						snprintf(entry->subnqn, 256, "%s", subsystem->subnqn);

						entry->tsas = port->tsas;

						entry->tsas = fabric_intf->tsas;

					}

					numrec++;

				}