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

Pull first round of SCSI updates from James Bottomley:
 "This patch consists of the usual driver updates (megaraid_sas,
  scsi_debug, qla2xxx, qla4xxx, lpfc, bnx2fc, be2iscsi, hpsa, ipr) plus
  an assortment of minor fixes and the first precursors of SCSI-MQ (the
  code path simplifications) and the bug fix for the USB oops on remove
  (which involves an infrastructure change, so is sent via the main tree
  with a delayed backport after a cycle in which it is shown to
  introduce no new bugs)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (196 commits)
  [SCSI] sd: Quiesce mode sense error messages
  [SCSI] add support for per-host cmd pools
  [SCSI] simplify command allocation and freeing a bit
  [SCSI] megaraid: simplify internal command handling
  [SCSI] ses: Use vpd information from scsi_device
  [SCSI] Add EVPD page 0x83 and 0x80 to sysfs
  [SCSI] Return VPD page length in scsi_vpd_inquiry()
  [SCSI] scsi_sysfs: Implement 'is_visible' callback
  [SCSI] hpsa: update driver version to 3.4.4-1
  [SCSI] hpsa: fix bad endif placement in RAID 5 mapper code
  [SCSI] qla2xxx: Fix build errors related to invalid print fields on some architectures.
  [SCSI] bfa: Replace large udelay() with mdelay()
  [SCSI] vmw_pvscsi: Some improvements in pvscsi driver.
  [SCSI] vmw_pvscsi: Add support for I/O requests coalescing.
  [SCSI] vmw_pvscsi: Fix pvscsi_abort() function.
  [SCSI] remove deprecated IRQF_DISABLED from SCSI
  [SCSI] bfa: Updating Maintainers email ids
  [SCSI] ipr: Add new CCIN definition for Grand Canyon support
  [SCSI] ipr: Format HCAM overlay ID 0x21
  [SCSI] ipr: Use pci_enable_msi_range() and pci_enable_msix_range()
  ...

1 files changed, 12 insertions, 19 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 8d4092b33c07..209853ce0bbc 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -390,6 +390,7 @@ struct qla_flt_region {
 #define MBOX_CMD_CLEAR_DATABASE_ENTRY           0x0031
 #define MBOX_CMD_CONN_OPEN                      0x0074
 #define MBOX_CMD_CONN_CLOSE_SESS_LOGOUT         0x0056
+#define DDB_NOT_LOGGED_IN                       0x09
 #define LOGOUT_OPTION_CLOSE_SESSION             0x0002
 #define LOGOUT_OPTION_RELOGIN                   0x0004
 #define LOGOUT_OPTION_FREE_DDB                  0x0008
@@ -505,9 +506,9 @@ struct qla_flt_region {
 #define MBOX_ASTS_RESPONSE_QUEUE_FULL           0x8028
 #define MBOX_ASTS_IP_ADDR_STATE_CHANGED         0x8029
 #define MBOX_ASTS_IPV6_DEFAULT_ROUTER_CHANGED   0x802A
-#define MBOX_ASTS_IPV6_PREFIX_EXPIRED           0x802B
-#define MBOX_ASTS_IPV6_ND_PREFIX_IGNORED        0x802C
-#define MBOX_ASTS_IPV6_LCL_PREFIX_IGNORED       0x802D
+#define MBOX_ASTS_IPV6_LINK_MTU_CHANGE          0x802B
+#define MBOX_ASTS_IPV6_AUTO_PREFIX_IGNORED      0x802C
+#define MBOX_ASTS_IPV6_ND_LOCAL_PREFIX_IGNORED  0x802D
 #define MBOX_ASTS_ICMPV6_ERROR_MSG_RCVD         0x802E
 #define MBOX_ASTS_INITIALIZATION_FAILED         0x8031
 #define MBOX_ASTS_SYSTEM_WARNING_EVENT          0x8036
@@ -528,14 +529,14 @@ struct qla_flt_region {
 #define ACB_CONFIG_DISABLE              0x00
 #define ACB_CONFIG_SET                  0x01
 
-/* ACB State Defines */
-#define ACB_STATE_UNCONFIGURED  0x00
-#define ACB_STATE_INVALID       0x01
-#define ACB_STATE_ACQUIRING     0x02
-#define ACB_STATE_TENTATIVE     0x03
-#define ACB_STATE_DEPRICATED    0x04
-#define ACB_STATE_VALID         0x05
-#define ACB_STATE_DISABLING     0x06
+/* ACB/IP Address State Defines */
+#define IP_ADDRSTATE_UNCONFIGURED       0
+#define IP_ADDRSTATE_INVALID            1
+#define IP_ADDRSTATE_ACQUIRING          2
+#define IP_ADDRSTATE_TENTATIVE          3
+#define IP_ADDRSTATE_DEPRICATED         4
+#define IP_ADDRSTATE_PREFERRED          5
+#define IP_ADDRSTATE_DISABLING          6
 
 /* FLASH offsets */
 #define FLASH_SEGMENT_IFCB      0x04000000
@@ -698,14 +699,6 @@ struct addr_ctrl_blk {
         uint8_t ipv6_lnk_lcl_addr_state;/* 222 */
         uint8_t ipv6_addr0_state;       /* 223 */
         uint8_t ipv6_addr1_state;       /* 224 */
-#define IP_ADDRSTATE_UNCONFIGURED       0
-#define IP_ADDRSTATE_INVALID            1
-#define IP_ADDRSTATE_ACQUIRING          2
-#define IP_ADDRSTATE_TENTATIVE          3
-#define IP_ADDRSTATE_DEPRICATED         4
-#define IP_ADDRSTATE_PREFERRED          5
-#define IP_ADDRSTATE_DISABLING          6
-
         uint8_t ipv6_dflt_rtr_state;    /* 225 */
 #define IPV6_RTRSTATE_UNKNOWN                   0
 #define IPV6_RTRSTATE_MANUAL                    1