Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / aic94xx / aic94xx_sas.h

diff --git a/drivers/scsi/aic94xx/aic94xx_sas.h b/drivers/scsi/aic94xx/aic94xx_sas.h
index 64d231712345127095cc377777c0324b644b9531..912e6b755f74971c82a5a867cafbddd217e6f85b 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx_sas.h
+++ b/drivers/scsi/aic94xx/aic94xx_sas.h
@@ -34,6 +34,7 @@
  * domain that this sequencer can maintain low-level connections for
  * us.  They are be 64 bytes.
  */
+#define ASD_MAX_DDBS   128
 
 struct asd_ddb_ssp_smp_target_port {
        u8     conn_type;         /* byte 0 */
@@ -291,7 +292,7 @@ struct scb_header {
 #define INITIATE_SSP_TASK       0x00
 #define INITIATE_LONG_SSP_TASK  0x01
 #define INITIATE_BIDIR_SSP_TASK 0x02
-#define ABORT_TASK              0x03
+#define SCB_ABORT_TASK          0x03
 #define INITIATE_SSP_TMF        0x04
 #define SSP_TARG_GET_DATA       0x05
 #define SSP_TARG_GET_DATA_GOOD  0x06
@@ -733,6 +734,7 @@ struct asd_phy {
 
        struct sas_identify_frame *identify_frame;
        struct asd_dma_tok  *id_frm_tok;
+       struct asd_port     *asd_port;
 
        u8         frame_rcvd[ASD_EDB_SIZE];
 };