From 389918c4c8360cdbe2352016cba64aa321f95b5f Mon Sep 17 00:00:00 2001
From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Sun, 10 Dec 2006 00:05:12 -0200
Subject: [PATCH] --- yaml --- r: 44276 b: refs/heads/master c:
 f6282f4da5eb67e08eff94d73a1911c3a008846a h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/dccp/output.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 49d2d9d23199..ef954dab3db2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf58a381e8106fe73247c753e3da58fcb5eabd2e
+refs/heads/master: f6282f4da5eb67e08eff94d73a1911c3a008846a
diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c
index 29a8e8508462..b4df12b24161 100644
--- a/trunk/net/dccp/output.c
+++ b/trunk/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);
+		}
 	}
 }