diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-21 12:22:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-21 12:22:33 -0700 |
| commit | cffc7b38a23960d5f83b0aec5e67f189a6ae8062 (patch) | |
| tree | 2d3d5f6bd4447a482d4fcf51a788e2fc4c34c20d /net/ipv4/tcp_output.c | |
| parent | e29971f9a4ca08c3c31b98be96c293ef9f7dcc32 (diff) | |
| parent | b2cc99f04c5a732c793519aca61a20f719b50db4 (diff) | |
| download | linux-cffc7b38a23960d5f83b0aec5e67f189a6ae8062.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 7114031fdc70e3..b907456a79f463 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -435,17 +435,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss int nsize, old_factor; u16 flags; - if (unlikely(len >= skb->len)) { - if (net_ratelimit()) { - 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; - } - + BUG_ON(len > skb->len); nsize = skb_headlen(skb) - len; if (nsize < 0) nsize = 0; |