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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (104 commits)
  [SCSI] fcoe: fix configuration problems
  [SCSI] cxgb3i: fix select/depend problem
  [SCSI] fcoe: fix incorrect use of struct module
  [SCSI] cxgb3i: remove use of skb->sp
  [SCSI] cxgb3i: Add cxgb3i iSCSI driver.
  [SCSI] zfcp: Remove unnecessary warning message
  [SCSI] zfcp: Add support for unchained FSF requests
  [SCSI] zfcp: Remove busid macro
  [SCSI] zfcp: remove DID_DID flag
  [SCSI] zfcp: Simplify mask lookups for incoming RSCNs
  [SCSI] zfcp: Remove initial device data from zfcp_data
  [SCSI] zfcp: fix compile warning
  [SCSI] zfcp: Remove adapter list
  [SCSI] zfcp: Simplify SBAL allocation to fix sparse warnings
  [SCSI] zfcp: register with SCSI layer on ccw registration
  [SCSI] zfcp: Fix message line break
  [SCSI] qla2xxx: changes in multiq code
  [SCSI] eata: fix the data buffer accessors conversion regression
  [SCSI] ibmvfc: Improve async event handling
  [SCSI] lpfc : correct printk types on PPC compiles
  ...

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h
index d1d14202575a..ee1f1e794c2d 100644
--- a/drivers/scsi/qla2xxx/qla_fw.h
+++ b/drivers/scsi/qla2xxx/qla_fw.h
@@ -299,7 +299,8 @@ struct init_cb_24xx {
         uint32_t response_q_address[2];
         uint32_t prio_request_q_address[2];
 
-        uint8_t reserved_2[8];
+        uint16_t msix;
+        uint8_t reserved_2[6];
 
         uint16_t atio_q_inpointer;
         uint16_t atio_q_length;
@@ -372,8 +373,9 @@ struct init_cb_24xx {
          * BIT 17-31 = Reserved
          */
         uint32_t firmware_options_3;
-
-        uint8_t  reserved_3[24];
+        uint16_t qos;
+        uint16_t rid;
+        uint8_t  reserved_3[20];
 };
 
 /*
@@ -754,7 +756,8 @@ struct abort_entry_24xx {
 
         uint32_t handle_to_abort;       /* System handle to abort. */
 
-        uint8_t reserved_1[32];
+        uint16_t req_que_no;
+        uint8_t reserved_1[30];
 
         uint8_t port_id[3];             /* PortID of destination port. */
         uint8_t vp_index;
@@ -1258,7 +1261,8 @@ struct qla_npiv_header {
 struct qla_npiv_entry {
         uint16_t flags;
         uint16_t vf_id;
-        uint16_t qos;
+        uint8_t q_qos;
+        uint8_t f_qos;
         uint16_t unused1;
         uint8_t port_name[WWN_SIZE];
         uint8_t node_name[WWN_SIZE];