[I/OAT]: Rename cleanup_rbuf to tcp_cleanup_rbuf and make non-static
Needed to be able to call tcp_cleanup_rbuf in tcp_input.c for I/OAT Signed-off-by: Chris Leech <christopher.leech@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
97fc2f0848
commit
0e4b4992b8
|
@ -294,6 +294,8 @@ extern int tcp_rcv_established(struct sock *sk,
|
||||||
|
|
||||||
extern void tcp_rcv_space_adjust(struct sock *sk);
|
extern void tcp_rcv_space_adjust(struct sock *sk);
|
||||||
|
|
||||||
|
extern void tcp_cleanup_rbuf(struct sock *sk, int copied);
|
||||||
|
|
||||||
extern int tcp_twsk_unique(struct sock *sk,
|
extern int tcp_twsk_unique(struct sock *sk,
|
||||||
struct sock *sktw, void *twp);
|
struct sock *sktw, void *twp);
|
||||||
|
|
||||||
|
|
|
@ -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
|
* calculation of whether or not we must ACK for the sake of
|
||||||
* a window update.
|
* 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);
|
struct tcp_sock *tp = tcp_sk(sk);
|
||||||
int time_to_ack = 0;
|
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. */
|
/* Clean up data we have read: This will do ACK frames. */
|
||||||
if (copied)
|
if (copied)
|
||||||
cleanup_rbuf(sk, copied);
|
tcp_cleanup_rbuf(sk, copied);
|
||||||
return 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) {
|
if (!sysctl_tcp_low_latency && tp->ucopy.task == user_recv) {
|
||||||
/* Install new reader */
|
/* Install new reader */
|
||||||
|
@ -1391,7 +1391,7 @@ skip_copy:
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Clean up data we have read: This will do ACK frames. */
|
/* Clean up data we have read: This will do ACK frames. */
|
||||||
cleanup_rbuf(sk, copied);
|
tcp_cleanup_rbuf(sk, copied);
|
||||||
|
|
||||||
TCP_CHECK_TIMER(sk);
|
TCP_CHECK_TIMER(sk);
|
||||||
release_sock(sk);
|
release_sock(sk);
|
||||||
|
@ -1858,7 +1858,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
|
||||||
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &&
|
(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &&
|
||||||
inet_csk_ack_scheduled(sk)) {
|
inet_csk_ack_scheduled(sk)) {
|
||||||
icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
|
icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
|
||||||
cleanup_rbuf(sk, 1);
|
tcp_cleanup_rbuf(sk, 1);
|
||||||
if (!(val & 1))
|
if (!(val & 1))
|
||||||
icsk->icsk_ack.pingpong = 1;
|
icsk->icsk_ack.pingpong = 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue