diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /net/ipv4/tcp_output.c | |
| parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
| parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv4/tcp_output.c')
| -rw-r--r-- | net/ipv4/tcp_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 6094db5e11be..15e1134da1b2 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
| @@ -499,7 +499,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss | |||
| 499 | /* If this packet has been sent out already, we must | 499 | /* If this packet has been sent out already, we must |
| 500 | * adjust the various packet counters. | 500 | * adjust the various packet counters. |
| 501 | */ | 501 | */ |
| 502 | if (after(tp->snd_nxt, TCP_SKB_CB(buff)->end_seq)) { | 502 | if (!before(tp->snd_nxt, TCP_SKB_CB(buff)->end_seq)) { |
| 503 | int diff = old_factor - tcp_skb_pcount(skb) - | 503 | int diff = old_factor - tcp_skb_pcount(skb) - |
| 504 | tcp_skb_pcount(buff); | 504 | tcp_skb_pcount(buff); |
| 505 | 505 | ||