diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2011-02-19 16:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-20 14:10:14 -0500 |
commit | 089c34827e52346f0303d1e6a7b744c1f4da3095 (patch) | |
tree | 79f42bd0c4782aca57f3fe9d0f941f5c04b566a4 /net/ipv6 | |
parent | 81146ec1b85067e70b71e81b5ecd9998ce054c0e (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/ipv6')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index d6954e318324..1d0ab5570904 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -1636,10 +1636,8 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
1636 | opt_skb = skb_clone(skb, GFP_ATOMIC); | 1636 | opt_skb = skb_clone(skb, GFP_ATOMIC); |
1637 | 1637 | ||
1638 | if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ | 1638 | if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ |
1639 | TCP_CHECK_TIMER(sk); | ||
1640 | if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) | 1639 | if (tcp_rcv_established(sk, skb, tcp_hdr(skb), skb->len)) |
1641 | goto reset; | 1640 | goto reset; |
1642 | TCP_CHECK_TIMER(sk); | ||
1643 | if (opt_skb) | 1641 | if (opt_skb) |
1644 | goto ipv6_pktoptions; | 1642 | goto ipv6_pktoptions; |
1645 | return 0; | 1643 | return 0; |
@@ -1667,10 +1665,8 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) | |||
1667 | } | 1665 | } |
1668 | } | 1666 | } |
1669 | 1667 | ||
1670 | TCP_CHECK_TIMER(sk); | ||
1671 | if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) | 1668 | if (tcp_rcv_state_process(sk, skb, tcp_hdr(skb), skb->len)) |
1672 | goto reset; | 1669 | goto reset; |
1673 | TCP_CHECK_TIMER(sk); | ||
1674 | if (opt_skb) | 1670 | if (opt_skb) |
1675 | goto ipv6_pktoptions; | 1671 | goto ipv6_pktoptions; |
1676 | return 0; | 1672 | return 0; |