Merge branch 'for-4.9/block-irq' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / nvme / host / fabrics.h

diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h
index 46e460a..924145c 100644 (file)
--- a/drivers/nvme/host/fabrics.h
+++ b/drivers/nvme/host/fabrics.h
@@ -52,6 +52,7 @@ enum {
        NVMF_OPT_KATO           = 1 << 7,
        NVMF_OPT_HOSTNQN        = 1 << 8,
        NVMF_OPT_RECONNECT_DELAY = 1 << 9,
+       NVMF_OPT_HOST_TRADDR    = 1 << 10,
 };
 
 /**
@@ -64,9 +65,12 @@ enum {
  *             being added.
  * @subsysnqn: Hold the fully qualified NQN subystem name (format defined
  *             in the NVMe specification, "NVMe Qualified Names").
- * @traddr:    network address that will be used by the host to communicate
- *             to the added NVMe controller.
- * @trsvcid:   network port used for host-controller communication.
+ * @traddr:    The transport-specific TRADDR field for a port on the
+ *              subsystem which is adding a controller.
+ * @trsvcid:   The transport-specific TRSVCID field for a port on the
+ *              subsystem which is adding a controller.
+ * @host_traddr: A transport-specific field identifying the NVME host port
+ *              to use for the connection to the controller.
  * @queue_size: Number of IO queue elements.
  * @nr_io_queues: Number of controller IO queues that will be established.
  * @reconnect_delay: Time between two consecutive reconnect attempts.
@@ -80,6 +84,7 @@ struct nvmf_ctrl_options {
        char                    *subsysnqn;
        char                    *traddr;
        char                    *trsvcid;
+       char                    *host_traddr;
        size_t                  queue_size;
        unsigned int            nr_io_queues;
        unsigned int            reconnect_delay;