patch-2.4.8 linux/drivers/scsi/cpqfcTS.h

Next file: linux/drivers/scsi/cpqfcTScontrol.c
Previous file: linux/drivers/scsi/cpqfc.Readme
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.7/linux/drivers/scsi/cpqfcTS.h linux/drivers/scsi/cpqfcTS.h
@@ -5,11 +5,13 @@
 // These functions are required by the Linux SCSI layers
 extern int cpqfcTS_detect(Scsi_Host_Template *);
 extern int cpqfcTS_release(struct Scsi_Host *);
-const char * cpqfcTS_info(struct Scsi_Host *);
+extern const char * cpqfcTS_info(struct Scsi_Host *);
 extern int cpqfcTS_proc_info(char *, char **, off_t, int, int, int);
 extern int cpqfcTS_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *));
 extern int cpqfcTS_abort(Scsi_Cmnd *);
 extern int cpqfcTS_reset(Scsi_Cmnd *, unsigned int);
+extern int cpqfcTS_eh_abort(Scsi_Cmnd *Cmnd);
+extern int cpqfcTS_eh_device_reset(Scsi_Cmnd *);
 extern int cpqfcTS_biosparam(Disk *, kdev_t, int[]);
 extern int cpqfcTS_ioctl( Scsi_Device *ScsiDev, int Cmnd, void *arg);
 
@@ -24,8 +26,10 @@
  proc_info:              cpqfcTS_proc_info,      \
  ioctl:                  cpqfcTS_ioctl,          \
  queuecommand:           cpqfcTS_queuecommand,   \
- eh_abort_handler:       cpqfcTS_abort,          \
+ eh_device_reset_handler:   cpqfcTS_eh_device_reset,   \
+ eh_abort_handler:       cpqfcTS_eh_abort,       \
  reset:                  cpqfcTS_reset,          \
+ abort:                  cpqfcTS_abort,		 \
  bios_param:             cpqfcTS_biosparam,      \
  can_queue:              CPQFCTS_REQ_QUEUE_LEN,  \
  this_id:                -1,                     \
@@ -33,7 +37,8 @@
  cmd_per_lun:            CPQFCTS_CMD_PER_LUN,    \
  present:                0,                      \
  unchecked_isa_dma:      0,                      \
- use_clustering:         ENABLE_CLUSTERING       \
+ use_clustering:         ENABLE_CLUSTERING,      \
+ use_new_eh_code:        1			 \
 }
 
 #endif /* CPQFCTS_H */ 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)