lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
* 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
This commit is contained in:
Linus Torvalds
2006-06-20 17:39:53 -07:00
parent be883da759 ff7512e1a2
commit a4cfae13ce
9 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/sctp/sctp.h
View File

@ -254,7 +254,7 @@ extern int sctp_debug_flag;
#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr))
#define SCTP_ASSERT(expr, str, func)
#endif /* SCTP_DEBUG */