diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-27 23:38:53 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-27 23:38:53 -0400 |
| commit | 4542437679de448de0f75bc901dab380d6a5bc5b (patch) | |
| tree | 1a436c9b6f9459c3938e2bb1ab7ad2c888d0003c /net/ipv4/tcp_input.c | |
| parent | 2227718ca2f7d5fcc2741c1bbca4d0c2efd340ce (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
Merge in v2.6.14 by hand
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 677419d0c9ad..3e98b57578dc 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
| @@ -2239,6 +2239,7 @@ static int tcp_ack_update_window(struct sock *sk, struct tcp_sock *tp, | |||
| 2239 | /* Note, it is the only place, where | 2239 | /* Note, it is the only place, where |
| 2240 | * fast path is recovered for sending TCP. | 2240 | * fast path is recovered for sending TCP. |
| 2241 | */ | 2241 | */ |
| 2242 | tp->pred_flags = 0; | ||
| 2242 | tcp_fast_path_check(sk, tp); | 2243 | tcp_fast_path_check(sk, tp); |
| 2243 | 2244 | ||
| 2244 | if (nwin > tp->max_window) { | 2245 | if (nwin > tp->max_window) { |