From 84153b23b5ddf4871dcd06657c8d3e18f099194c Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 22 Jul 2008 15:32:42 +0000
Subject: [PATCH] Minor changes and docs updates

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@471 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t/qla2x00-target/ChangeLog  |  1 +
 qla2x00t/qla2x00-target/README     |  3 ++-
 qla2x00t/qla2x00-target/qla2x00t.c |  3 +++
 qla2x00t/qla2x_tgt_def.h           |  2 +-
 scst/include/scst_debug.h          | 30 +++++++++++++++---------------
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/qla2x00t/qla2x00-target/ChangeLog b/qla2x00t/qla2x00-target/ChangeLog
index 866f1d057..cbfc42474 100644
--- a/qla2x00t/qla2x00-target/ChangeLog
+++ b/qla2x00t/qla2x00-target/ChangeLog
@@ -1,6 +1,7 @@
 Summary of changes between versions 1.0.0 and 1.0.1
 ---------------------------------------------------
 
+ - Fixed possible oops in the initiator driver on the module unload
 
 
 Summary of changes between versions 0.9.5 and 1.0.0
diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README
index de3f1f557..0ba13e54e 100644
--- a/qla2x00t/qla2x00-target/README
+++ b/qla2x00t/qla2x00-target/README
@@ -13,7 +13,8 @@ all necessary callbacks, but it's still capable to work as initiator
 only. Mode, when a host acts as the initiator and the target
 simultaneously, is supported as well.
 
-This version is compatible with SCST core version 1.0.0 and higher.
+This version is compatible with SCST core version 1.0.0 and higher and
+Linux kernel 2.6.16 and higher.
 
 The original initiator driver was taken from the kernel 2.6.17.8.
 
diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c
index d3136d445..3e0e78d3d 100644
--- a/qla2x00t/qla2x00-target/qla2x00t.c
+++ b/qla2x00t/qla2x00-target/qla2x00t.c
@@ -2226,6 +2226,9 @@ static int __init q2t_init(void)
 
 	TRACE_ENTRY();
 
+	PRINT_INFO("Initializing QLogic Fibre Channel HBA Driver target mode "
+		"addon version %s", Q2T_VERSION_STRING);
+
 	q2t_cmd_cachep = KMEM_CACHE(q2t_cmd, SCST_SLAB_FLAGS);
 	if (q2t_cmd_cachep == NULL) {
 		res = -ENOMEM;
diff --git a/qla2x00t/qla2x_tgt_def.h b/qla2x00t/qla2x_tgt_def.h
index 87f5fa15c..33249546d 100644
--- a/qla2x00t/qla2x_tgt_def.h
+++ b/qla2x00t/qla2x_tgt_def.h
@@ -40,7 +40,7 @@
 #endif
 
 #define QLA2X_TARGET_MAGIC	153
-#define QLA2X_INITIATOR_MAGIC   54203
+#define QLA2X_INITIATOR_MAGIC   54205
 
 #define QLA2X00_COMMAND_COUNT_INIT	250
 #define QLA2X00_IMMED_NOTIFY_COUNT_INIT 250
diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h
index cf8a79a62..a83d1a845 100644
--- a/scst/include/scst_debug.h
+++ b/scst/include/scst_debug.h
@@ -169,9 +169,9 @@ do {									\
 
 #else  /* CONFIG_SCST_DEBUG || CONFIG_SCST_TRACING */
 
-#define TRACE(trace, args...) {}
-#define PRINT_BUFFER(message, buff, len) {}
-#define PRINT_BUFF_FLAG(flag, message, buff, len) {}
+#define TRACE(trace, args...) do {} while (0)
+#define PRINT_BUFFER(message, buff, len) do {} while (0)
+#define PRINT_BUFF_FLAG(flag, message, buff, len) do {} while (0)
 
 #endif /* CONFIG_SCST_DEBUG || CONFIG_SCST_TRACING */
 
@@ -319,18 +319,18 @@ do {									\
 
 #else  /* CONFIG_SCST_DEBUG */
 
-#define TRACE_MEM(format, args...) {}
-#define TRACE_SG(format, args...) {}
-#define TRACE_DBG(format, args...) {}
-#define TRACE_DBG_SPECIAL(format, args...) {}
-#define TRACE_MGMT_DBG(format, args...) {}
-#define TRACE_MGMT_DBG_SPECIAL(format, args...) {}
-#define TRACE_BUFFER(message, buff, len) {}
-#define TRACE_BUFF_FLAG(flag, message, buff, len) {}
-#define TRACE_ENTRY() {}
-#define TRACE_EXIT() {}
-#define TRACE_EXIT_RES(res) {}
-#define TRACE_EXIT_HRES(res) {}
+#define TRACE_MEM(format, args...) do {} while (0)
+#define TRACE_SG(format, args...) do {} while (0)
+#define TRACE_DBG(format, args...) do {} while (0)
+#define TRACE_DBG_SPECIAL(format, args...) do {} while (0)
+#define TRACE_MGMT_DBG(format, args...) do {} while (0)
+#define TRACE_MGMT_DBG_SPECIAL(format, args...) do {} while (0)
+#define TRACE_BUFFER(message, buff, len) do {} while (0)
+#define TRACE_BUFF_FLAG(flag, message, buff, len) do {} while (0)
+#define TRACE_ENTRY() do {} while (0)
+#define TRACE_EXIT() do {} while (0)
+#define TRACE_EXIT_RES(res) do {} while (0)
+#define TRACE_EXIT_HRES(res) do {} while (0)
 
 #ifdef LOG_PREFIX