Commit 0e4b4992 authored by Chris Leech's avatar Chris Leech Committed by David S. Miller
Browse files

[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: default avatarChris Leech <christopher.leech@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 97fc2f08

include/net/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ extern int tcp_rcv_established(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,

						struct sock *sktw, void *twp);

net/ipv4/tcp.c

+5 −5
Original line number Diff line number Diff line
@@ -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 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	 */



	/* 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;

			}