diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2007-11-24 19:08:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:54:59 -0500 |
commit | da98e0b5d4c1f88b7c9e63e8918783cd4905be2b (patch) | |
tree | 4a0dcc5d424b325b67c3b9f7d9a90dea9a4b1780 /net/dccp | |
parent | 95b21d7e9d099f1cffca08e40f292d6658a88b3c (diff) |
[CCID2]: Redundant debugging output
This reduces the amount of redundant debugging messages:
* pipe/cwnd are printed in both tx_send_packet() and tx_packet_sent().
Both functions are called immediately after one another, so one occurrence is sufficient.
* Since tx_packet_sent() prints pipe/cwnd already, the second printk for pipe is redundant.
* In tx_packet_sent() the check_sanity function is called twice (at the begin and at the end).
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ccids/ccid2.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index 237007bb55a8..2d1b7e30a73c 100644 --- a/net/dccp/ccids/ccid2.c +++ b/net/dccp/ccids/ccid2.c | |||
@@ -126,9 +126,6 @@ static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) | |||
126 | { | 126 | { |
127 | struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); | 127 | struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); |
128 | 128 | ||
129 | ccid2_pr_debug("pipe=%d cwnd=%d\n", hctx->ccid2hctx_pipe, | ||
130 | hctx->ccid2hctx_cwnd); | ||
131 | |||
132 | if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd) { | 129 | if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd) { |
133 | /* OK we can send... make sure previous packet was sent off */ | 130 | /* OK we can send... make sure previous packet was sent off */ |
134 | if (!hctx->ccid2hctx_sendwait) { | 131 | if (!hctx->ccid2hctx_sendwait) { |
@@ -239,8 +236,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) | |||
239 | struct ccid2_seq *next; | 236 | struct ccid2_seq *next; |
240 | u64 seq; | 237 | u64 seq; |
241 | 238 | ||
242 | ccid2_hc_tx_check_sanity(hctx); | ||
243 | |||
244 | BUG_ON(!hctx->ccid2hctx_sendwait); | 239 | BUG_ON(!hctx->ccid2hctx_sendwait); |
245 | hctx->ccid2hctx_sendwait = 0; | 240 | hctx->ccid2hctx_sendwait = 0; |
246 | hctx->ccid2hctx_pipe++; | 241 | hctx->ccid2hctx_pipe++; |
@@ -326,7 +321,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len) | |||
326 | ccid2_start_rto_timer(sk); | 321 | ccid2_start_rto_timer(sk); |
327 | 322 | ||
328 | #ifdef CONFIG_IP_DCCP_CCID2_DEBUG | 323 | #ifdef CONFIG_IP_DCCP_CCID2_DEBUG |
329 | ccid2_pr_debug("pipe=%d\n", hctx->ccid2hctx_pipe); | ||
330 | ccid2_pr_debug("Sent: seq=%llu\n", (unsigned long long)seq); | 324 | ccid2_pr_debug("Sent: seq=%llu\n", (unsigned long long)seq); |
331 | do { | 325 | do { |
332 | struct ccid2_seq *seqp = hctx->ccid2hctx_seqt; | 326 | struct ccid2_seq *seqp = hctx->ccid2hctx_seqt; |