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://neil.brown.name/md
[pandora-kernel.git]
/
net
/
ipv4
/
ip_fragment.c
diff --git
a/net/ipv4/ip_fragment.c
b/net/ipv4/ip_fragment.c
index
38d38f0
..
2152d22
100644
(file)
--- a/
net/ipv4/ip_fragment.c
+++ b/
net/ipv4/ip_fragment.c
@@
-488,8
+488,8
@@
static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
qp->q.fragments = head;
}
-
BUG_TRAP(head !
= NULL);
-
BUG_TRAP(FRAG_CB(head)->offset =
= 0);
+
WARN_ON(head =
= NULL);
+
WARN_ON(FRAG_CB(head)->offset !
= 0);
/* Allocate a new buffer for the datagram. */
ihlen = ip_hdrlen(head);