8 files changed, 78 insertions, 3 deletions

diff --git a/include/scsi/fc/Kbuild b/include/scsi/fc/Kbuild
new file mode 100644
index 000000000000..56603813c6cd
--- /dev/null
+++ b/include/scsi/fc/Kbuild
@@ -0,0 +1,4 @@
+header-y += fc_els.h
+header-y += fc_fs.h
+header-y += fc_gs.h
+header-y += fc_ns.h
diff --git a/include/scsi/fc/fc_els.h b/include/scsi/fc/fc_els.h
index 195ca014d3ce..f94328132a26 100644
--- a/include/scsi/fc/fc_els.h
+++ b/include/scsi/fc/fc_els.h
@@ -20,6 +20,8 @@
 #ifndef _FC_ELS_H_
 #define _FC_ELS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Switch - Enhanced Link Services definitions.
  * From T11 FC-LS Rev 1.2 June 7, 2005.
@@ -248,10 +250,12 @@ struct fc_els_csp {
 /*
  * sp_features
  */
-#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel. off. */
+#define FC_SP_FT_NPIV   0x8000  /* multiple N_Port_ID support (FLOGI) */
+#define FC_SP_FT_CIRO   0x8000  /* continuously increasing rel off (PLOGI) */
 #define FC_SP_FT_CLAD   0x8000  /* clean address (in FLOGI LS_ACC) */
 #define FC_SP_FT_RAND   0x4000  /* random relative offset */
 #define FC_SP_FT_VAL    0x2000  /* valid vendor version level */
+#define FC_SP_FT_NPIV_ACC       0x2000  /* NPIV assignment (FLOGI LS_ACC) */
 #define FC_SP_FT_FPORT  0x1000  /* F port (1) vs. N port (0) */
 #define FC_SP_FT_ABB    0x0800  /* alternate BB_credit management */
 #define FC_SP_FT_EDTR   0x0400  /* E_D_TOV Resolution is nanoseconds */
diff --git a/include/scsi/fc/fc_fcoe.h b/include/scsi/fc/fc_fcoe.h
index ccb3dbe90463..e6ad3d2ae475 100644
--- a/include/scsi/fc/fc_fcoe.h
+++ b/include/scsi/fc/fc_fcoe.h
@@ -86,6 +86,18 @@ struct fcoe_crc_eof {
 #define FCOE_MIN_FRAME 46
 
 /*
+ * FCoE Link Error Status Block: T11 FC-BB-5 Rev2.0, Clause 7.10.
+ */
+struct fcoe_fc_els_lesb {
+        __be32          lesb_link_fail; /* link failure count */
+        __be32          lesb_vlink_fail; /* virtual link failure count */
+        __be32          lesb_miss_fka;  /* missing FIP keep-alive count */
+        __be32          lesb_symb_err;  /* symbol error during carrier count */
+        __be32          lesb_err_block; /* errored block count */
+        __be32          lesb_fcs_error; /* frame check sequence error count */
+};
+
+/*
  * fc_fcoe_set_mac - Store OUI + DID into MAC address field.
  * @mac: mac address to be set
  * @did: fc dest id to use
diff --git a/include/scsi/fc/fc_fcp.h b/include/scsi/fc/fc_fcp.h
index 5d38f1989f37..747e2c7d88d6 100644
--- a/include/scsi/fc/fc_fcp.h
+++ b/include/scsi/fc/fc_fcp.h
@@ -83,6 +83,8 @@ struct fcp_cmnd32 {
  * fc_tm_flags - task management flags field.
  */
 #define FCP_TMF_CLR_ACA         0x40    /* clear ACA condition */
+#define FCP_TMF_TGT_RESET       0x20    /* target reset task management,
+                                           deprecated as of FCP-3 */
 #define FCP_TMF_LUN_RESET       0x10    /* logical unit reset task management */
 #define FCP_TMF_CLR_TASK_SET    0x04    /* clear task set */
 #define FCP_TMF_ABT_TASK_SET    0x02    /* abort task set */
@@ -196,4 +198,10 @@ struct fcp_srr {
         __u8            srr_resvd2[3];  /* reserved */
 };
 
+/*
+ * Feature bits in name server FC-4 Features object.
+ */
+#define FCP_FEAT_TARG   (1 << 0)        /* target function supported */
+#define FCP_FEAT_INIT   (1 << 1)        /* initiator function supported */
+
 #endif /* _FC_FCP_H_ */
diff --git a/include/scsi/fc/fc_fip.h b/include/scsi/fc/fc_fip.h
index 3d138c1fcf8a..17baa19380f0 100644
--- a/include/scsi/fc/fc_fip.h
+++ b/include/scsi/fc/fc_fip.h
@@ -214,11 +214,21 @@ struct fip_vn_desc {
  */
 struct fip_fka_desc {
         struct fip_desc fd_desc;
-        __u8            fd_resvd[2];
+        __u8            fd_resvd;
+        __u8            fd_flags;       /* bit0 is fka disable flag */
         __be32          fd_fka_period;  /* adv./keep-alive period in mS */
 } __attribute__((packed));
 
 /*
+ * flags for fip_fka_desc.fd_flags
+ */
+enum fip_fka_flags {
+        FIP_FKA_ADV_D = 0x01,           /* no need for FKA from ENode */
+};
+
+/* FIP_DT_FKA flags */
+
+/*
  * FIP_DT_VENDOR descriptor.
  */
 struct fip_vendor_desc {
diff --git a/include/scsi/fc/fc_fs.h b/include/scsi/fc/fc_fs.h
index ac4cd38c860e..50f28b143451 100644
--- a/include/scsi/fc/fc_fs.h
+++ b/include/scsi/fc/fc_fs.h
@@ -20,6 +20,8 @@
 #ifndef _FC_FS_H_
 #define _FC_FS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Framing and Signalling definitions.
  * From T11 FC-FS-2 Rev 0.90 - 9 August 2005.
diff --git a/include/scsi/fc/fc_gs.h b/include/scsi/fc/fc_gs.h
index 324dd0e3c622..a37346d47eb1 100644
--- a/include/scsi/fc/fc_gs.h
+++ b/include/scsi/fc/fc_gs.h
@@ -20,6 +20,8 @@
 #ifndef _FC_GS_H_
 #define _FC_GS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Services - Common Transport.
  * From T11.org FC-GS-2 Rev 5.3 November 1998.
diff --git a/include/scsi/fc/fc_ns.h b/include/scsi/fc/fc_ns.h
index 790d7b97d4bc..e7d3ac497d7d 100644
--- a/include/scsi/fc/fc_ns.h
+++ b/include/scsi/fc/fc_ns.h
@@ -20,6 +20,8 @@
 #ifndef _FC_NS_H_
 #define _FC_NS_H_
 
+#include <linux/types.h>
+
 /*
  * Fibre Channel Services - Name Service (dNS)
  * From T11.org FC-GS-2 Rev 5.3 November 1998.
@@ -44,9 +46,12 @@ enum fc_ns_req {
         FC_NS_GID_FT =  0x0171,         /* get IDs by FC4 type */
         FC_NS_GPN_FT =  0x0172,         /* get port names by FC4 type */
         FC_NS_GID_PT =  0x01a1,         /* get IDs by port type */
-        FC_NS_RFT_ID =  0x0217,         /* reg FC4 type for ID */
         FC_NS_RPN_ID =  0x0212,         /* reg port name for ID */
         FC_NS_RNN_ID =  0x0213,         /* reg node name for ID */
+        FC_NS_RFT_ID =  0x0217,         /* reg FC4 type for ID */
+        FC_NS_RSPN_ID = 0x0218,         /* reg symbolic port name */
+        FC_NS_RFF_ID =  0x021f,         /* reg FC4 Features for ID */
+        FC_NS_RSNN_NN = 0x0239,         /* reg symbolic node name */
 };
 
 /*
@@ -156,4 +161,32 @@ struct fc_ns_rn_id {
         __be64          fr_wwn;         /* node name or port name */
 } __attribute__((__packed__));
 
+/*
+ * RSNN_NN request - register symbolic node name
+ */
+struct fc_ns_rsnn {
+        __be64          fr_wwn;         /* node name */
+        __u8            fr_name_len;
+        char            fr_name[];
+} __attribute__((__packed__));
+
+/*
+ * RSPN_ID request - register symbolic port name
+ */
+struct fc_ns_rspn {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __u8            fr_name_len;
+        char            fr_name[];
+} __attribute__((__packed__));
+
+/*
+ * RFF_ID request - register FC-4 Features for ID.
+ */
+struct fc_ns_rff_id {
+        struct fc_ns_fid fr_fid;        /* port ID object */
+        __u8            fr_resvd[2];
+        __u8            fr_feat;        /* FC-4 Feature bits */
+        __u8            fr_type;        /* FC-4 type */
+} __attribute__((__packed__));
+
 #endif /* _FC_NS_H_ */