patch-2.2.17 linux/drivers/scsi/qlogicfc.c

• Lines: 21
• Date: Mon Sep 4 18:39:21 2000
• Orig file: v2.2.16/drivers/scsi/qlogicfc.c
• Orig date: Mon Sep 4 18:37:36 2000

diff -u --recursive --new-file v2.2.16/drivers/scsi/qlogicfc.c linux/drivers/scsi/qlogicfc.c
@@ -867,7 +867,7 @@
 
 	short param[8];
 	int i, j;
-	struct id_name_map temp[QLOGICFC_MAX_ID + 1];
+	static struct id_name_map temp[QLOGICFC_MAX_ID + 1];
 	struct isp2x00_hostdata *hostdata;
 
 	isp2x00_disable_irqs(host);
@@ -1904,9 +1904,9 @@
 #endif
 
 	hostdata->wwn = (u64) (hostdata->control_block.node_name[0]) << 56;
-	hostdata->wwn |= (u64) (hostdata->control_block.node_name[0] & 0xff00) << 48;
+	hostdata->wwn |= (u64) (hostdata->control_block.node_name[0] & 0xff00) << 40;
+	hostdata->wwn |= (u64) (hostdata->control_block.node_name[1] & 0x00ff) << 40;
 	hostdata->wwn |= (u64) (hostdata->control_block.node_name[1] & 0xff00) << 24;
-	hostdata->wwn |= (u64) (hostdata->control_block.node_name[1] & 0x00ff) << 48;
 	hostdata->wwn |= (u64) (hostdata->control_block.node_name[2] & 0x00ff) << 24;
 	hostdata->wwn |= (u64) (hostdata->control_block.node_name[2] & 0xff00) << 8;
 	hostdata->wwn |= (u64) (hostdata->control_block.node_name[3] & 0x00ff) << 8;