diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 20:42:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 20:42:47 -0400 |
| commit | 2f79f458d2ab4a77f1b9df8d0041e51ce085d7c0 (patch) | |
| tree | 0f6652830f84a1150c72094c572ab83fe502b057 /net/ipv4/tcp_output.c | |
| parent | 2d21247998c5d183179a7e822c4032974a53ff49 (diff) | |
| parent | e130af5dab2abbf01c5d92ec5ac05912cf3d9aa7 (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 | 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. */ |
