diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-12-09 21:05:12 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-11 17:34:48 -0500 |
commit | f6282f4da5eb67e08eff94d73a1911c3a008846a (patch) | |
tree | e9d0afde4f959e374caa5b8eb4c3c9d2c588eb38 /net | |
parent | bf58a381e8106fe73247c753e3da58fcb5eabd2e (diff) |
[DCCP]: Warn when discarding packet due to internal errors
This adds a (debug) warning message which is triggered whenever a packet is
discarded due to send failure.
It also adds a conditional, so that an interruption during dccp_wait_for_ccid
is not treated as a `BUG': the rationale is that interruptions are external,
whereas bug warnings are concerned with the internals.
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@mandriva.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/dccp/output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 29a8e8508462..b4df12b24161 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c | |||
@@ -241,7 +241,7 @@ void dccp_write_xmit(struct sock *sk, int block) | |||
241 | break; | 241 | break; |
242 | } else | 242 | } else |
243 | err = dccp_wait_for_ccid(sk, skb); | 243 | err = dccp_wait_for_ccid(sk, skb); |
244 | if (err) | 244 | if (err && err != -EINTR) |
245 | DCCP_BUG("err=%d after dccp_wait_for_ccid", err); | 245 | DCCP_BUG("err=%d after dccp_wait_for_ccid", err); |
246 | } | 246 | } |
247 | 247 | ||
@@ -267,8 +267,10 @@ void dccp_write_xmit(struct sock *sk, int block) | |||
267 | if (err) | 267 | if (err) |
268 | DCCP_BUG("err=%d after ccid_hc_tx_packet_sent", | 268 | DCCP_BUG("err=%d after ccid_hc_tx_packet_sent", |
269 | err); | 269 | err); |
270 | } else | 270 | } else { |
271 | dccp_pr_debug("packet discarded\n"); | ||
271 | kfree(skb); | 272 | kfree(skb); |
273 | } | ||
272 | } | 274 | } |
273 | } | 275 | } |
274 | 276 | ||