diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 19:07:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 19:07:59 -0700 |
commit | 02d31ed258434b29eb0e3a10f5ede6eecd46b6ba (patch) | |
tree | e901ed8af00756086e2da1a5e0c52602d2b01603 /net/ipv4/tcp_output.c | |
parent | 1b66e9fe8523cc239b6bea8443a860f50aeb2a83 (diff) | |
parent | 9ff5c59ce278c37bca22fbf98076d199bcaf9845 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 8225e425725..f37a50e55b6 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -435,7 +435,14 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss int nsize, old_factor; u16 flags; - BUG_ON(len >= skb->len); + if (unlikely(len >= skb->len)) { + printk(KERN_DEBUG "TCP: seg_size=%u, mss=%u, seq=%u, " + "end_seq=%u, skb->len=%u.\n", len, mss_now, + TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq, + skb->len); + WARN_ON(1); + return 0; + } nsize = skb_headlen(skb) - len; if (nsize < 0) |