aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorShan Wei <shanwei@cn.fujitsu.com>2011-02-19 16:55:45 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-20 14:10:14 -0500
commit089c34827e52346f0303d1e6a7b744c1f4da3095 (patch)
tree79f42bd0c4782aca57f3fe9d0f941f5c04b566a4 /net/ipv4/tcp.c
parent81146ec1b85067e70b71e81b5ecd9998ce054c0e (diff)
tcp: Remove debug macro of TCP_CHECK_TIMER
Now, TCP_CHECK_TIMER is not used for debuging, it does nothing. And, it has been there for several years, maybe 6 years. Remove it to keep code clearer. Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f9867d2dbef4..a17a5a72b98d 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -873,9 +873,7 @@ int tcp_sendpage(struct sock *sk, struct page *page, int offset,
873 flags); 873 flags);
874 874
875 lock_sock(sk); 875 lock_sock(sk);
876 TCP_CHECK_TIMER(sk);
877 res = do_tcp_sendpages(sk, &page, offset, size, flags); 876 res = do_tcp_sendpages(sk, &page, offset, size, flags);
878 TCP_CHECK_TIMER(sk);
879 release_sock(sk); 877 release_sock(sk);
880 return res; 878 return res;
881} 879}
@@ -916,7 +914,6 @@ int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
916 long timeo; 914 long timeo;
917 915
918 lock_sock(sk); 916 lock_sock(sk);
919 TCP_CHECK_TIMER(sk);
920 917
921 flags = msg->msg_flags; 918 flags = msg->msg_flags;
922 timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT); 919 timeo = sock_sndtimeo(sk, flags & MSG_DONTWAIT);
@@ -1104,7 +1101,6 @@ wait_for_memory:
1104out: 1101out:
1105 if (copied) 1102 if (copied)
1106 tcp_push(sk, flags, mss_now, tp->nonagle); 1103 tcp_push(sk, flags, mss_now, tp->nonagle);
1107 TCP_CHECK_TIMER(sk);
1108 release_sock(sk); 1104 release_sock(sk);
1109 return copied; 1105 return copied;
1110 1106
@@ -1123,7 +1119,6 @@ do_error:
1123 goto out; 1119 goto out;
1124out_err: 1120out_err:
1125 err = sk_stream_error(sk, flags, err); 1121 err = sk_stream_error(sk, flags, err);
1126 TCP_CHECK_TIMER(sk);
1127 release_sock(sk); 1122 release_sock(sk);
1128 return err; 1123 return err;
1129} 1124}
@@ -1415,8 +1410,6 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
1415 1410
1416 lock_sock(sk); 1411 lock_sock(sk);
1417 1412
1418 TCP_CHECK_TIMER(sk);
1419
1420 err = -ENOTCONN; 1413 err = -ENOTCONN;
1421 if (sk->sk_state == TCP_LISTEN) 1414 if (sk->sk_state == TCP_LISTEN)
1422 goto out; 1415 goto out;
@@ -1767,12 +1760,10 @@ skip_copy:
1767 /* Clean up data we have read: This will do ACK frames. */ 1760 /* Clean up data we have read: This will do ACK frames. */
1768 tcp_cleanup_rbuf(sk, copied); 1761 tcp_cleanup_rbuf(sk, copied);
1769 1762
1770 TCP_CHECK_TIMER(sk);
1771 release_sock(sk); 1763 release_sock(sk);
1772 return copied; 1764 return copied;
1773 1765
1774out: 1766out:
1775 TCP_CHECK_TIMER(sk);
1776 release_sock(sk); 1767 release_sock(sk);
1777 return err; 1768 return err;
1778 1769