patch-2.3.43 linux/drivers/scsi/hosts.c

• Lines: 60
• Date: Wed Feb 9 18:40:23 2000
• Orig file: v2.3.42/linux/drivers/scsi/hosts.c
• Orig date: Fri Jan 28 15:09:08 2000

diff -u --recursive --new-file v2.3.42/linux/drivers/scsi/hosts.c linux/drivers/scsi/hosts.c
@@ -9,6 +9,8 @@
  *  <drew@colorado.edu>
  *
  *  Jiffies wrap fixes (host->resetting), 3 Dec 1998 Andrea Arcangeli
+ *  Added QLOGIC QLA1280 SCSI controller kernel host support. 
+ *     August 4, 1999 Fred Lewis, Intel DuPont
  */
 
 
@@ -191,6 +193,10 @@
 #include "qlogicfc.h"
 #endif
 
+#ifdef CONFIG_SCSI_QLOGIC_1280
+#include "qla1280.h"
+#endif
+
 #ifdef CONFIG_SCSI_SEAGATE
 #include "seagate.h"
 #endif
@@ -528,6 +534,9 @@
 #ifdef CONFIG_SCSI_QLOGIC_FC
     QLOGICFC,
 #endif
+#ifdef CONFIG_SCSI_QLOGIC_1280
+    QLA1280_LINUX_TEMPLATE, 
+#endif
 #ifdef CONFIG_SCSI_PAS16
     MV_PAS16,
 #endif
@@ -689,7 +698,7 @@
 	}
     }
     next_scsi_host--;
-    scsi_init_free((char *) sh, sizeof(struct Scsi_Host) + sh->extra_bytes);
+    kfree((char *) sh);
 }
 
 /* We call this when we come across a new host adapter. We only do this
@@ -699,8 +708,9 @@
 
 struct Scsi_Host * scsi_register(Scsi_Host_Template * tpnt, int j){
     struct Scsi_Host * retval, *shpnt;
-    retval = (struct Scsi_Host *)scsi_init_malloc(sizeof(struct Scsi_Host) + j,
-						  (tpnt->unchecked_isa_dma && j ? GFP_DMA : 0) | GFP_ATOMIC);
+    retval = (struct Scsi_Host *)kmalloc(sizeof(struct Scsi_Host) + j,
+					 (tpnt->unchecked_isa_dma && j ? GFP_DMA : 0) | GFP_ATOMIC);
+    memset(retval, 0, sizeof(struct Scsi_Host) + j);
     atomic_set(&retval->host_active,0);
     retval->host_busy = 0;
     retval->host_failed = 0;
@@ -745,7 +755,7 @@
     retval->unchecked_isa_dma = tpnt->unchecked_isa_dma;
     retval->use_clustering = tpnt->use_clustering;   
 
-    retval->select_queue_depths = NULL;
+    retval->select_queue_depths = tpnt->select_queue_depths;
 
     if(!scsi_hostlist)
 	scsi_hostlist = retval;