|
@@ -873,9 +873,7 @@ int tcp_sendpage(struct sock *sk, struct page *page, int offset,
|
|
flags);
|
|
flags);
|
|
|
|
|
|
lock_sock(sk);
|
|
lock_sock(sk);
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
res = do_tcp_sendpages(sk, &page, offset, size, flags);
|
|
res = do_tcp_sendpages(sk, &page, offset, size, flags);
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|
|
@@ -916,7 +914,6 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|
long timeo;
|
|
long timeo;
|
|
|
|
|
|
lock_sock(sk);
|
|
lock_sock(sk);
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
|
|
|
|
flags = msg->msg_flags;
|
|
flags = msg->msg_flags;
|
|
timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
|
|
timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
|
|
@@ -1104,7 +1101,6 @@ wait_for_memory:
|
|
out:
|
|
out:
|
|
if (copied)
|
|
if (copied)
|
|
tcp_push(sk, flags, mss_now, tp->nonagle);
|
|
tcp_push(sk, flags, mss_now, tp->nonagle);
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return copied;
|
|
return copied;
|
|
|
|
|
|
@@ -1123,7 +1119,6 @@ do_error:
|
|
goto out;
|
|
goto out;
|
|
out_err:
|
|
out_err:
|
|
err = sk_stream_error(sk, flags, err);
|
|
err = sk_stream_error(sk, flags, err);
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
@@ -1415,8 +1410,6 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|
|
|
|
|
lock_sock(sk);
|
|
lock_sock(sk);
|
|
|
|
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
-
|
|
|
|
err = -ENOTCONN;
|
|
err = -ENOTCONN;
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
goto out;
|
|
goto out;
|
|
@@ -1767,12 +1760,10 @@ skip_copy:
|
|
/* Clean up data we have read: This will do ACK frames. */
|
|
/* Clean up data we have read: This will do ACK frames. */
|
|
tcp_cleanup_rbuf(sk, copied);
|
|
tcp_cleanup_rbuf(sk, copied);
|
|
|
|
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return copied;
|
|
return copied;
|
|
|
|
|
|
out:
|
|
out:
|
|
- TCP_CHECK_TIMER(sk);
|
|
|
|
release_sock(sk);
|
|
release_sock(sk);
|
|
return err;
|
|
return err;
|
|
|
|
|