diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:53 -0400 |
| commit | a4cfae13cef6a700a04b13ba1d819c0641b1b26f (patch) | |
| tree | 91aa4f8be6df4494276d1a064d9f8f2b994aa367 /include/net/sctp/sctp.h | |
| parent | be883da7594b0a2a02074e683673ae0e522566a4 (diff) | |
| parent | ff7512e1a2a3504649d3716a757f43807b6d26ef (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ATM]: fix broken uses of NIPQUAD in net/atm
[SCTP]: sctp_unpack_cookie() fix
[SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
[NET]: Prevent multiple qdisc runs
[CONNECTOR]: Initialize subsystem earlier.
[NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length
Diffstat (limited to 'include/net/sctp/sctp.h')
| -rw-r--r-- | include/net/sctp/sctp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 237f82b05e40..a9663b49ea54 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -254,7 +254,7 @@ extern int sctp_debug_flag; | |||
| 254 | #define SCTP_DEBUG_PRINTK_IPADDR(whatever...) | 254 | #define SCTP_DEBUG_PRINTK_IPADDR(whatever...) |
| 255 | #define SCTP_ENABLE_DEBUG | 255 | #define SCTP_ENABLE_DEBUG |
| 256 | #define SCTP_DISABLE_DEBUG | 256 | #define SCTP_DISABLE_DEBUG |
| 257 | #define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr)) | 257 | #define SCTP_ASSERT(expr, str, func) |
| 258 | 258 | ||
| 259 | #endif /* SCTP_DEBUG */ | 259 | #endif /* SCTP_DEBUG */ |
| 260 | 260 | ||