Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f6282f4da5eb67e08eff94d73a1911c3a008846a
Commit:     f6282f4da5eb67e08eff94d73a1911c3a008846a
Parent:     bf58a381e8106fe73247c753e3da58fcb5eabd2e
Author:     Gerrit Renker <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 10 00:05:12 2006 -0200
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Dec 11 14:34:48 2006 -0800

    [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 <[EMAIL PROTECTED]>
    Acked-by: Ian McDonald <[EMAIL PROTECTED]>
    Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
---
 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 29a8e85..b4df12b 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -241,7 +241,7 @@ void dccp_write_xmit(struct sock *sk, int block)
                                break;
                        } else
                                err = dccp_wait_for_ccid(sk, skb);
-                       if (err)
+                       if (err && err != -EINTR)
                                DCCP_BUG("err=%d after dccp_wait_for_ccid", 
err);
                }
 
@@ -267,8 +267,10 @@ void dccp_write_xmit(struct sock *sk, int block)
                        if (err)
                                DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",
                                         err);
-               } else
+               } else {
+                       dccp_pr_debug("packet discarded\n");
                        kfree(skb);
+               }
        }
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to