diff options
author | Flavio Leitner <fbl@redhat.com> | 2011-10-24 04:15:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-24 17:36:08 -0400 |
commit | 78d81d15b74246c7cedf84894434890b33da3907 (patch) | |
tree | cf2dd0b8d51204c4a956f443adaa2c90732aa0b0 | |
parent | 8b1857357acd919b9a7fa391afbea30123fdfaec (diff) |
TCP: remove TCP_DEBUG
It was enabled by default and the messages guarded
by the define are useful.
Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/tcp.h | 1 | ||||
-rw-r--r-- | net/ipv4/tcp.c | 2 | ||||
-rw-r--r-- | net/ipv4/tcp_timer.c | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index ed0e81452827..e147f42d643d 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -18,7 +18,6 @@ | |||
18 | #ifndef _TCP_H | 18 | #ifndef _TCP_H |
19 | #define _TCP_H | 19 | #define _TCP_H |
20 | 20 | ||
21 | #define TCP_DEBUG 1 | ||
22 | #define FASTRETRANS_DEBUG 1 | 21 | #define FASTRETRANS_DEBUG 1 |
23 | 22 | ||
24 | #include <linux/list.h> | 23 | #include <linux/list.h> |
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index eefc61e3d0e4..34f5db1e1c8b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1193,13 +1193,11 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied) | |||
1193 | struct tcp_sock *tp = tcp_sk(sk); | 1193 | struct tcp_sock *tp = tcp_sk(sk); |
1194 | int time_to_ack = 0; | 1194 | int time_to_ack = 0; |
1195 | 1195 | ||
1196 | #if TCP_DEBUG | ||
1197 | struct sk_buff *skb = skb_peek(&sk->sk_receive_queue); | 1196 | struct sk_buff *skb = skb_peek(&sk->sk_receive_queue); |
1198 | 1197 | ||
1199 | WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq), | 1198 | WARN(skb && !before(tp->copied_seq, TCP_SKB_CB(skb)->end_seq), |
1200 | "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n", | 1199 | "cleanup rbuf bug: copied %X seq %X rcvnxt %X\n", |
1201 | tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt); | 1200 | tp->copied_seq, TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt); |
1202 | #endif | ||
1203 | 1201 | ||
1204 | if (inet_csk_ack_scheduled(sk)) { | 1202 | if (inet_csk_ack_scheduled(sk)) { |
1205 | const struct inet_connection_sock *icsk = inet_csk(sk); | 1203 | const struct inet_connection_sock *icsk = inet_csk(sk); |
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index ecd44b0c45f1..2e0f0af76c19 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c | |||
@@ -334,7 +334,6 @@ void tcp_retransmit_timer(struct sock *sk) | |||
334 | * connection. If the socket is an orphan, time it out, | 334 | * connection. If the socket is an orphan, time it out, |
335 | * we cannot allow such beasts to hang infinitely. | 335 | * we cannot allow such beasts to hang infinitely. |
336 | */ | 336 | */ |
337 | #ifdef TCP_DEBUG | ||
338 | struct inet_sock *inet = inet_sk(sk); | 337 | struct inet_sock *inet = inet_sk(sk); |
339 | if (sk->sk_family == AF_INET) { | 338 | if (sk->sk_family == AF_INET) { |
340 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", | 339 | LIMIT_NETDEBUG(KERN_DEBUG "TCP: Peer %pI4:%u/%u unexpectedly shrunk window %u:%u (repaired)\n", |
@@ -349,7 +348,6 @@ void tcp_retransmit_timer(struct sock *sk) | |||
349 | inet->inet_num, tp->snd_una, tp->snd_nxt); | 348 | inet->inet_num, tp->snd_una, tp->snd_nxt); |
350 | } | 349 | } |
351 | #endif | 350 | #endif |
352 | #endif | ||
353 | if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) { | 351 | if (tcp_time_stamp - tp->rcv_tstamp > TCP_RTO_MAX) { |
354 | tcp_write_err(sk); | 352 | tcp_write_err(sk); |
355 | goto out; | 353 | goto out; |