diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-11 04:02:40 +0000 |
| commit | e47f00743fc4776491344f2c618cc8dc2c23bcbc (patch) | |
| tree | 13e03a113a82a184c51c19c209867cfd3a59b3b9 /include/net | |
| parent | b2ad5f821b1381492d792ca10b1eb7a107b48f14 (diff) | |
Merge with Linux 2.4.0.
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/irda/irda.h | 6 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 8bdfee75a..41ad4aa0f 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h @@ -66,9 +66,9 @@ extern __u32 irda_debug; #define IRDA_DEBUG(n, args...) (irda_debug >= (n)) ? (printk(KERN_DEBUG args)) : 0 #define ASSERT(expr, func) \ if(!(expr)) { \ - printk( "Assertion failed! %s,%s,%s,line=%d\n",\ - #expr,__FILE__,__FUNCTION__,__LINE__); \ - ##func} + printk( "Assertion failed! %s:%s:%d %s\n", \ + __FILE__,__FUNCTION__,__LINE__,(#expr)); \ + func } #else #define IRDA_DEBUG(n, args...) #define ASSERT(expr, func) diff --git a/include/net/sock.h b/include/net/sock.h index 6272cf459..14c480ea5 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -458,7 +458,7 @@ struct tcp_opt { /* Define this to get the sk->debug debugging facility. */ #define SOCK_DEBUGGING #ifdef SOCK_DEBUGGING -#define SOCK_DEBUG(sk, msg...) do { if((sk) && ((sk)->debug)) printk(KERN_DEBUG ## msg); } while (0) +#define SOCK_DEBUG(sk, msg...) do { if((sk) && ((sk)->debug)) printk(KERN_DEBUG msg); } while (0) #else #define SOCK_DEBUG(sk, msg...) do { } while (0) #endif |