3 files changed, 21 insertions, 3 deletions

diff --git a/include/linux/mtio.h b/include/linux/mtio.h
index 8f825756c459..18543e2db06f 100644
--- a/include/linux/mtio.h
+++ b/include/linux/mtio.h
@@ -194,6 +194,7 @@ struct	mtpos {
 #define MT_ST_SYSV              0x1000
 #define MT_ST_NOWAIT            0x2000
 #define MT_ST_SILI              0x4000
+#define MT_ST_NOWAIT_EOF        0x8000
 
 /* The mode parameters to be controlled. Parameter chosen with bits 20-28 */
 #define MT_ST_CLEAR_DEFAULT     0xfffff
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 9c23ee8fd2d3..917741bb8e11 100644
--- a/include/scsi/iscsi_if.h
+++ b/include/scsi/iscsi_if.h
@@ -261,7 +261,8 @@ struct iscsi_uevent {
                 } host_event;
                 struct msg_ping_comp {
                         uint32_t        host_no;
-                        uint32_t        status;
+                        uint32_t        status; /* enum
+                                                 * iscsi_ping_status_code */
                         uint32_t        pid;    /* unique ping id associated
                                                    with each ping request */
                         uint32_t        data_size;
@@ -483,6 +484,20 @@ enum iscsi_port_state {
         ISCSI_PORT_STATE_UP             = 0x2,
 };
 
+/* iSCSI PING status/error code */
+enum iscsi_ping_status_code {
+        ISCSI_PING_SUCCESS                      = 0,
+        ISCSI_PING_FW_DISABLED                  = 0x1,
+        ISCSI_PING_IPADDR_INVALID               = 0x2,
+        ISCSI_PING_LINKLOCAL_IPV6_ADDR_INVALID  = 0x3,
+        ISCSI_PING_TIMEOUT                      = 0x4,
+        ISCSI_PING_INVALID_DEST_ADDR            = 0x5,
+        ISCSI_PING_OVERSIZE_PACKET              = 0x6,
+        ISCSI_PING_ICMP_ERROR                   = 0x7,
+        ISCSI_PING_MAX_REQ_EXCEEDED             = 0x8,
+        ISCSI_PING_NO_ARP_RECEIVED              = 0x9,
+};
+
 #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle)
 #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr)
 
@@ -578,6 +593,6 @@ struct iscsi_chap_rec {
         char username[ISCSI_CHAP_AUTH_NAME_MAX_LEN];
         uint8_t password[ISCSI_CHAP_AUTH_SECRET_MAX_LEN];
         uint8_t password_length;
-} __packed;
+};
 
 #endif
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 5a35a2a2d3c5..cfdb55f0937e 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -165,7 +165,8 @@ struct fcoe_ctlr {
  * @switch_name: WWN of switch from advertisement
  * @fabric_name: WWN of fabric from advertisement
  * @fc_map:      FC_MAP value from advertisement
- * @fcf_mac:     Ethernet address of the FCF
+ * @fcf_mac:     Ethernet address of the FCF for FIP traffic
+ * @fcoe_mac:    Ethernet address of the FCF for FCoE traffic
  * @vfid:        virtual fabric ID
  * @pri:         selection priority, smaller values are better
  * @flogi_sent:  current FLOGI sent to this FCF
@@ -188,6 +189,7 @@ struct fcoe_fcf {
         u32 fc_map;
         u16 vfid;
         u8 fcf_mac[ETH_ALEN];
+        u8 fcoe_mac[ETH_ALEN];
 
         u8 pri;
         u8 flogi_sent;