aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_ipv4.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_ipv4.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_ipv4.c')
-rw-r--r--net/ipv4/tcp_ipv4.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index e2b9be27f226..ef5a90beb9b0 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1556,12 +1556,10 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
1556 1556
1557 if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ 1557 if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */
1558 sock_rps_save_rxhash(sk, skb->rxhash); 1558 sock_rps_save_rxhash(sk, skb->rxhash);
1559 TCP_CHECK_TIMER(sk);
1560 if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) { 1559 if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) {
1561 rsk = sk; 1560 rsk = sk;
1562 goto reset; 1561 goto reset;
1563 } 1562 }
1564 TCP_CHECK_TIMER(sk);
1565 return 0; 1563 return 0;
1566 } 1564 }
1567 1565
@@ -1583,13 +1581,10 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
1583 } else 1581 } else
1584 sock_rps_save_rxhash(sk, skb->rxhash); 1582 sock_rps_save_rxhash(sk, skb->rxhash);
1585 1583
1586
1587 TCP_CHECK_TIMER(sk);
1588 if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) { 1584 if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) {
1589 rsk = sk; 1585 rsk = sk;
1590 goto reset; 1586 goto reset;
1591 } 1587 }
1592 TCP_CHECK_TIMER(sk);
1593 return 0; 1588 return 0;
1594 1589
1595reset: 1590reset: