diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-10-27 12:53:03 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-10-27 12:53:03 -0700 |
| commit | 04290949b3daef35d6279dcc05f01b549ac1772b (patch) | |
| tree | d34203b71660b9b4f7676f5bae7e0b9838ff161f /net/ipv4/tcp_output.c | |
| parent | d6d3f5bc68be3c4ab84e6f1f9db92291da671504 (diff) | |
| parent | 72ab373a5688a78cbdaf3bf96012e597d5399bb7 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 7114031fdc7..b907456a79f 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; |