diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-03 17:35:48 -0400 |
| commit | 36a2c6b28003dd0592b8ece5e9409991e0820f50 (patch) | |
| tree | c5b52547b2658a8a3b898b8224b835a7e8396017 /net/ipv4/tcp.c | |
| parent | 95916edd02e3a7752315422f386c55723d4a3637 (diff) | |
| parent | f1d39b291e2263f5e2f2ec5d4061802f76d8ae67 (diff) | |
| download | kernel-crypto-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.gz kernel-crypto-36a2c6b28003dd0592b8ece5e9409991e0820f50.tar.xz kernel-crypto-36a2c6b28003dd0592b8ece5e9409991e0820f50.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index f6a2d9223d0..934396bb137 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1132,7 +1132,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, tp->ucopy.dma_chan = NULL; preempt_disable(); if ((len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && - !sysctl_tcp_low_latency && __get_cpu_var(softnet_data.net_dma)) { + !sysctl_tcp_low_latency && __get_cpu_var(softnet_data).net_dma) { preempt_enable_no_resched(); tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len); } else @@ -1659,7 +1659,8 @@ adjudge_to_death: const int tmo = tcp_fin_time(sk); if (tmo > TCP_TIMEWAIT_LEN) { - inet_csk_reset_keepalive_timer(sk, tcp_fin_time(sk)); + inet_csk_reset_keepalive_timer(sk, + tmo - TCP_TIMEWAIT_LEN); } else { tcp_time_wait(sk, TCP_FIN_WAIT2, tmo); goto out; |