---

yaml --- r: 141102 b: refs/heads/master c: a750c1c h: refs/heads/master v: v3
git-mirror · Apr 3, 2009 · 3bfb11d · 3bfb11d
1 parent b889ac9
commit 3bfb11d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 69 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8665b184749dbb3b55313e60e27ff93296f95d18
+refs/heads/master: a750c1c525dcfd2e134aba589a630212df39ea8d
diff --git a/trunk/drivers/staging/slicoss/slicdbg.h b/trunk/drivers/staging/slicoss/slicdbg.h
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
@@ -58,7 +58,6 @@
 #define KLUDGE_FOR_4GB_BOUNDARY         1
 #define DEBUG_MICROCODE                 1
 #define DBG                             1
-#define SLIC_ASSERT_ENABLED		        1
 #define SLIC_INTERRUPT_PROCESS_LIMIT	1
 #define SLIC_OFFLOAD_IP_CHECKSUM		1
 #define STATS_TIMER_INTERVAL			2
@@ -95,7 +94,6 @@
 
 #include <linux/ethtool.h>
 #include <linux/uaccess.h>
-#include "slicdbg.h"
 #include "slichw.h"
 #include "slic.h"
 
@@ -208,6 +206,21 @@ static struct pci_device_id slic_pci_tbl[] __devinitdata = {
 
 MODULE_DEVICE_TABLE(pci, slic_pci_tbl);
 
+#ifdef ASSERT
+#undef ASSERT
+#endif
+
+#ifndef ASSERT
+#define ASSERT(a) do {							\
+	if (!(a)) {							\
+		printk(KERN_ERR "slicoss ASSERT() Failure: function %s"	\
+			"line %d\n", __func__, __LINE__);		\
+		slic_assert_fail();					\
+	}								\
+} while (0)
+#endif
+
+
 #define SLIC_GET_SLIC_HANDLE(_adapter, _pslic_handle)                   \
 {                                                                       \
     spin_lock_irqsave(&_adapter->handle_lock.lock,                      \