Skip to content

Commit

Permalink
[I/OAT]: Rename cleanup_rbuf to tcp_cleanup_rbuf and make non-static
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chris Leech authored and David S. Miller committed Jun 18, 2006
1 parent 97fc2f0 commit 0e4b499
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions include/net/tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
10 changes: 5 additions & 5 deletions net/ipv4/tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 0e4b499

Please sign in to comment.