From 1ce1dc84f3743ce4707954700db7a618d5e7c0e9 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Sat, 27 Aug 2005 03:06:35 -0300
Subject: [PATCH] --- yaml --- r: 6431 b: refs/heads/master c:
 d6809c12b3334a929c39bf08ea63bd819e0500f7 h: refs/heads/master i:   6429:
 be85bae63fe50002f36454d1dd68baa9aa3527b5   6427:
 3e8335d1b0a09ff169b5575de25a7fc315bc3995   6423:
 e77dde24a2f772a9c73f4951929dae50540ca716   6415:
 c0bc2889c77e81e86cb0a01e4af5759e6258f40d   6399:
 254824d9fcffdd6ec5602390be681920dd6cb092 v: v3

---
 [refs]                       |  2 +-
 trunk/net/dccp/ccids/ccid3.c |  2 +-
 trunk/net/dccp/dccp.h        |  3 +-
 trunk/net/dccp/output.c      | 61 ++++++++++++++++++++++++++++++++++--
 trunk/net/dccp/proto.c       |  2 +-
 5 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 34c1e4528c0d..89ef94bd36a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75b3f207b433dcb807fcf0f47de1c8398571ba5f
+refs/heads/master: d6809c12b3334a929c39bf08ea63bd819e0500f7
diff --git a/trunk/net/dccp/ccids/ccid3.c b/trunk/net/dccp/ccids/ccid3.c
index cf93b019ecbe..9866dc175258 100644
--- a/trunk/net/dccp/ccids/ccid3.c
+++ b/trunk/net/dccp/ccids/ccid3.c
@@ -985,7 +985,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk,
 		ccid3_pr_debug("send_packet delay=%ld\n", delay);
 		delay /= -1000;
 		/* divide by -1000 is to convert to ms and get sign right */
-		rc = delay > 0 ? -EAGAIN : 0;
+		rc = delay > 0 ? delay : 0;
 		break;
 	default:
 		printk(KERN_CRIT "%s: %s, sk=%p, Illegal state (%d)!\n",
diff --git a/trunk/net/dccp/dccp.h b/trunk/net/dccp/dccp.h
index c6ba07ea1a9f..6ba21509e797 100644
--- a/trunk/net/dccp/dccp.h
+++ b/trunk/net/dccp/dccp.h
@@ -126,8 +126,7 @@ extern void dccp_send_delayed_ack(struct sock *sk);
 extern void dccp_send_sync(struct sock *sk, const u64 seq,
 			   const enum dccp_pkt_type pkt_type);
 
-extern int dccp_write_xmit(struct sock *sk, struct sk_buff *skb,
-			   const int len);
+extern int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, long *timeo);
 
 extern void dccp_init_xmit_timers(struct sock *sk);
 static inline void dccp_clear_xmit_timers(struct sock *sk)
diff --git a/trunk/net/dccp/output.c b/trunk/net/dccp/output.c
index f96dedd3ad5e..116f6db5678d 100644
--- a/trunk/net/dccp/output.c
+++ b/trunk/net/dccp/output.c
@@ -150,14 +150,71 @@ unsigned int dccp_sync_mss(struct sock *sk, u32 pmtu)
 	return mss_now;
 }
 
-int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, const int len)
+/**
+ * dccp_wait_for_ccid - Wait for ccid to tell us we can send a packet
+ * @sk: socket to wait for
+ * @timeo: for how long
+ */
+static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb,
+			      long *timeo)
+{
+	struct dccp_sock *dp = dccp_sk(sk);
+	DEFINE_WAIT(wait);
+	long delay;
+	int rc;
+
+	while (1) {
+		prepare_to_wait(sk->sk_sleep, &wait, TASK_INTERRUPTIBLE);
+
+		if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
+			goto do_error;
+		if (!*timeo)
+			goto do_nonblock;
+		if (signal_pending(current))
+			goto do_interrupted;
+
+		rc = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb,
+					    skb->len);
+		if (rc <= 0)
+			break;
+		delay = msecs_to_jiffies(rc);
+		if (delay > *timeo || delay < 0)
+			goto do_nonblock;
+
+		sk->sk_write_pending++;
+		release_sock(sk);
+		*timeo -= schedule_timeout(delay);
+		lock_sock(sk);
+		sk->sk_write_pending--;
+	}
+out:
+	finish_wait(sk->sk_sleep, &wait);
+	return rc;
+
+do_error:
+	rc = -EPIPE;
+	goto out;
+do_nonblock:
+	rc = -EAGAIN;
+	goto out;
+do_interrupted:
+	rc = sock_intr_errno(*timeo);
+	goto out;
+}
+
+int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, long *timeo)
 {
 	const struct dccp_sock *dp = dccp_sk(sk);
-	int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb, len);
+	int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb,
+					 skb->len);
+
+	if (err > 0)
+		err = dccp_wait_for_ccid(sk, skb, timeo);
 
 	if (err == 0) {
 		const struct dccp_ackpkts *ap = dp->dccps_hc_rx_ackpkts;
 		struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
+		const int len = skb->len;
 
 		if (sk->sk_state == DCCP_PARTOPEN) {
 			/* See 8.1.5.  Handshake Completion */
diff --git a/trunk/net/dccp/proto.c b/trunk/net/dccp/proto.c
index f97e92ea34f3..f4da6561e40c 100644
--- a/trunk/net/dccp/proto.c
+++ b/trunk/net/dccp/proto.c
@@ -261,7 +261,7 @@ int dccp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	if (rc != 0)
 		goto out_discard;
 
-	rc = dccp_write_xmit(sk, skb, len);
+	rc = dccp_write_xmit(sk, skb, &timeo);
 	/*
 	 * XXX we don't use sk_write_queue, so just discard the packet.
 	 *     Current plan however is to _use_ sk_write_queue with