git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
net
/
dccp
/
input.c
diff --git
a/net/dccp/input.c
b/net/dccp/input.c
index
08392ed
..
df2f110
100644
(file)
--- a/
net/dccp/input.c
+++ b/
net/dccp/input.c
@@
-413,7
+413,7
@@
static int dccp_rcv_request_sent_state_process(struct sock *sk,
/* Stop the REQUEST timer */
inet_csk_clear_xmit_timer(sk, ICSK_TIME_RETRANS);
-
BUG_TRAP(sk->sk_send_head !
= NULL);
+
WARN_ON(sk->sk_send_head =
= NULL);
__kfree_skb(sk->sk_send_head);
sk->sk_send_head = NULL;