netdev
[Top] [All Lists]

[PATCH] (1/3) 8139too -- put back old assert

To: Jeff Garzik <jgarzik@xxxxxxxxx>, OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Subject: [PATCH] (1/3) 8139too -- put back old assert
From: Stephen Hemminger <shemminger@xxxxxxxx>
Date: Wed, 19 Nov 2003 14:36:45 -0800
Cc: netdev@xxxxxxxxxxx
Organization: Open Source Development Lab
Sender: netdev-bounce@xxxxxxxxxxx
For net-drivers-2.5-exp:
Minimize code changes -- put back assert() macro with similar properties
to the original.  Added unlikely() and KERN_ERR tag.


diff -Nru a/drivers/net/8139too.c b/drivers/net/8139too.c
--- a/drivers/net/8139too.c     Wed Nov 19 14:33:54 2003
+++ b/drivers/net/8139too.c     Wed Nov 19 14:33:54 2003
@@ -152,7 +152,11 @@
 #ifdef RTL8139_NDEBUG
 #  define assert(expr) do {} while (0)
 #else
-#  define assert(expr) BUG_ON((expr) == 0)
+#  define assert(expr) \
+        if(unlikely(!(expr))) {                                        \
+        printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",        \
+        #expr,__FILE__,__FUNCTION__,__LINE__);                 \
+        }
 #endif
 
 

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] (1/3) 8139too -- put back old assert, Stephen Hemminger <=