diff options
author | Greg KH <gregkh@suse.de> | 2005-09-12 15:45:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:45:04 -0400 |
commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /net/ipv4/tcp_output.c | |
parent | 877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff) | |
parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) |
Merge ../torvalds-2.6/
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 15e1134da1b2..c10e4435e3b1 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -485,11 +485,6 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss | |||
485 | TCP_SKB_CB(buff)->when = TCP_SKB_CB(skb)->when; | 485 | TCP_SKB_CB(buff)->when = TCP_SKB_CB(skb)->when; |
486 | buff->tstamp = skb->tstamp; | 486 | buff->tstamp = skb->tstamp; |
487 | 487 | ||
488 | if (TCP_SKB_CB(skb)->sacked & TCPCB_LOST) { | ||
489 | tp->lost_out -= tcp_skb_pcount(skb); | ||
490 | tp->left_out -= tcp_skb_pcount(skb); | ||
491 | } | ||
492 | |||
493 | old_factor = tcp_skb_pcount(skb); | 488 | old_factor = tcp_skb_pcount(skb); |
494 | 489 | ||
495 | /* Fix up tso_factor for both original and new SKB. */ | 490 | /* Fix up tso_factor for both original and new SKB. */ |