diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:17:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:17:56 -0700 |
| commit | 228428428138e231a155464239880201e5cc8b44 (patch) | |
| tree | 89b437f5501d03ca36b717e232337426d0de77ca /net/sctp | |
| parent | 78681ac08a611313595d13cafabae1183b71ef48 (diff) | |
| parent | 6c3b8fc618905d7599dcc514c99ce4293d476f39 (diff) | |
| download | kernel_samsung_tuna-228428428138e231a155464239880201e5cc8b44.zip kernel_samsung_tuna-228428428138e231a155464239880201e5cc8b44.tar.gz kernel_samsung_tuna-228428428138e231a155464239880201e5cc8b44.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
netns: fix ip_rt_frag_needed rt_is_expired
netfilter: nf_conntrack_extend: avoid unnecessary "ct->ext" dereferences
netfilter: fix double-free and use-after free
netfilter: arptables in netns for real
netfilter: ip{,6}tables_security: fix future section mismatch
selinux: use nf_register_hooks()
netfilter: ebtables: use nf_register_hooks()
Revert "pkt_sched: sch_sfq: dump a real number of flows"
qeth: use dev->ml_priv instead of dev->priv
syncookies: Make sure ECN is disabled
net: drop unused BUG_TRAP()
net: convert BUG_TRAP to generic WARN_ON
drivers/net: convert BUG_TRAP to generic WARN_ON
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/associola.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index ec2a0a3..8472b8b 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -464,7 +464,7 @@ static void sctp_association_destroy(struct sctp_association *asoc) spin_unlock_bh(&sctp_assocs_id_lock); } - BUG_TRAP(!atomic_read(&asoc->rmem_alloc)); + WARN_ON(atomic_read(&asoc->rmem_alloc)); if (asoc->base.malloced) { kfree(asoc); |