|
@@ -937,7 +937,7 @@ static int tcp_recv_urg(struct sock *sk, long timeo,
|
|
|
* calculation of whether or not we must ACK for the sake of
|
|
|
* a window update.
|
|
|
*/
|
|
|
-static void cleanup_rbuf(struct sock *sk, int copied)
|
|
|
+void tcp_cleanup_rbuf(struct sock *sk, int copied)
|
|
|
{
|
|
|
struct tcp_sock *tp = tcp_sk(sk);
|
|
|
int time_to_ack = 0;
|
|
@@ -1086,7 +1086,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
|
|
|
|
|
|
/* Clean up data we have read: This will do ACK frames. */
|
|
|
if (copied)
|
|
|
- cleanup_rbuf(sk, copied);
|
|
|
+ tcp_cleanup_rbuf(sk, copied);
|
|
|
return copied;
|
|
|
}
|
|
|
|
|
@@ -1220,7 +1220,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- cleanup_rbuf(sk, copied);
|
|
|
+ tcp_cleanup_rbuf(sk, copied);
|
|
|
|
|
|
if (!sysctl_tcp_low_latency && tp->ucopy.task == user_recv) {
|
|
|
/* Install new reader */
|
|
@@ -1391,7 +1391,7 @@ skip_copy:
|
|
|
*/
|
|
|
|
|
|
/* Clean up data we have read: This will do ACK frames. */
|
|
|
- cleanup_rbuf(sk, copied);
|
|
|
+ tcp_cleanup_rbuf(sk, copied);
|
|
|
|
|
|
TCP_CHECK_TIMER(sk);
|
|
|
release_sock(sk);
|
|
@@ -1858,7 +1858,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
|
|
|
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &&
|
|
|
inet_csk_ack_scheduled(sk)) {
|
|
|
icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
|
|
|
- cleanup_rbuf(sk, 1);
|
|
|
+ tcp_cleanup_rbuf(sk, 1);
|
|
|
if (!(val & 1))
|
|
|
icsk->icsk_ack.pingpong = 1;
|
|
|
}
|