Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

Pull SCSI updates from James Bottomley:
 "This is primarily another round of driver updates (lpfc, bfa, fcoe,
  ipr) plus a new ufshcd driver.  There shouldn't be anything
  controversial in here (The final deletion of scsi proc_ops which
  caused some build breakage has been held over until the next merge
  window to give us more time to stabilise it).

  I'm afraid, with me moving continents at exactly the wrong time,
  anything submitted after the merge window opened has been held over to
  the next merge window."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (63 commits)
  [SCSI] ipr: Driver version 2.5.3
  [SCSI] ipr: Increase alignment boundary of command blocks
  [SCSI] ipr: Increase max concurrent oustanding commands
  [SCSI] ipr: Remove unnecessary memory barriers
  [SCSI] ipr: Remove unnecessary interrupt clearing on new adapters
  [SCSI] ipr: Fix target id allocation re-use problem
  [SCSI] atp870u, mpt2sas, qla4xxx use pci_dev->revision
  [SCSI] fcoe: Drop the rtnl_mutex before calling fcoe_ctlr_link_up
  [SCSI] bfa: Update the driver version to 3.0.23.0
  [SCSI] bfa: BSG and User interface fixes.
  [SCSI] bfa: Fix to avoid vport delete hang on request queue full scenario.
  [SCSI] bfa: Move service parameter programming logic into firmware.
  [SCSI] bfa: Revised Fabric Assigned Address(FAA) feature implementation.
  [SCSI] bfa: Flash controller IOC pll init fixes.
  [SCSI] bfa: Serialize the IOC hw semaphore unlock logic.
  [SCSI] bfa: Modify ISR to process pending completions
  [SCSI] bfa: Add fc host issue lip support
  [SCSI] mpt2sas: remove extraneous sas_log_info messages
  [SCSI] libfc: fcoe_transport_create fails in single-CPU environment
  [SCSI] fcoe: reduce contention for fcoe_rx_list lock [v2]
  ...

2 files changed, 20 insertions, 3 deletions

diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h
index 9c23ee8fd2d..917741bb8e1 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 5a35a2a2d3c..cfdb55f0937 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;