aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorChris Leech <christopher.leech@intel.com>2006-05-23 21:00:16 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-18 00:25:50 -0400
commit0e4b4992b8007c6b62ec143cbbb292f98813ca11 (patch)
treefccdef8ec226d1febc5f7c22a793b10337026187 /net/ipv4/tcp.c
parent97fc2f0848c928c63c2ae619deee61a0b1107b69 (diff)
[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>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index e2b7b8055037..1c0cfd7a8bbb 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -937,7 +937,7 @@ static int tcp_recv_urg(struct sock *sk, long timeo,
937 * calculation of whether or not we must ACK for the sake of 937 * calculation of whether or not we must ACK for the sake of
938 * a window update. 938 * a window update.
939 */ 939 */
940static void cleanup_rbuf(struct sock *sk, int copied) 940void tcp_cleanup_rbuf(struct sock *sk, int copied)
941{ 941{
942 struct tcp_sock *tp = tcp_sk(sk); 942 struct tcp_sock *tp = tcp_sk(sk);
943 int time_to_ack = 0; 943 int time_to_ack = 0;
@@ -1086,7 +1086,7 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc,
1086 1086
1087 /* Clean up data we have read: This will do ACK frames. */ 1087 /* Clean up data we have read: This will do ACK frames. */
1088 if (copied) 1088 if (copied)
1089 cleanup_rbuf(sk, copied); 1089 tcp_cleanup_rbuf(sk, copied);
1090 return copied; 1090 return copied;
1091} 1091}
1092 1092
@@ -1220,7 +1220,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
1220 } 1220 }
1221 } 1221 }
1222 1222
1223 cleanup_rbuf(sk, copied); 1223 tcp_cleanup_rbuf(sk, copied);
1224 1224
1225 if (!sysctl_tcp_low_latency && tp->ucopy.task == user_recv) { 1225 if (!sysctl_tcp_low_latency && tp->ucopy.task == user_recv) {
1226 /* Install new reader */ 1226 /* Install new reader */
@@ -1391,7 +1391,7 @@ skip_copy:
1391 */ 1391 */
1392 1392
1393 /* Clean up data we have read: This will do ACK frames. */ 1393 /* Clean up data we have read: This will do ACK frames. */
1394 cleanup_rbuf(sk, copied); 1394 tcp_cleanup_rbuf(sk, copied);
1395 1395
1396 TCP_CHECK_TIMER(sk); 1396 TCP_CHECK_TIMER(sk);
1397 release_sock(sk); 1397 release_sock(sk);
@@ -1858,7 +1858,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
1858 (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) && 1858 (TCPF_ESTABLISHED | TCPF_CLOSE_WAIT) &&
1859 inet_csk_ack_scheduled(sk)) { 1859 inet_csk_ack_scheduled(sk)) {
1860 icsk->icsk_ack.pending |= ICSK_ACK_PUSHED; 1860 icsk->icsk_ack.pending |= ICSK_ACK_PUSHED;
1861 cleanup_rbuf(sk, 1); 1861 tcp_cleanup_rbuf(sk, 1);
1862 if (!(val & 1)) 1862 if (!(val & 1))
1863 icsk->icsk_ack.pingpong = 1; 1863 icsk->icsk_ack.pingpong = 1;
1864 } 1864 }