diff -u --recursive --new-file linux-2.4.19-rpc_rtt2/include/linux/sunrpc/xprt.h linux-2.4.19-rpc_rtt3/include/linux/sunrpc/xprt.h
--- linux-2.4.19-rpc_rtt2/include/linux/sunrpc/xprt.h	Thu Aug  1 12:11:29 2002
+++ linux-2.4.19-rpc_rtt3/include/linux/sunrpc/xprt.h	Thu Aug  1 12:14:02 2002
@@ -99,6 +99,7 @@
 	u32			rq_bytes_sent;	/* Bytes we have sent */
 
 	long			rq_xtime;	/* when transmitted */
+	int			rq_ntimeo;
 	int			rq_nresend;
 };
 #define rq_svec			rq_snd_buf.head
diff -u --recursive --new-file linux-2.4.19-rpc_rtt2/net/sunrpc/xprt.c linux-2.4.19-rpc_rtt3/net/sunrpc/xprt.c
--- linux-2.4.19-rpc_rtt2/net/sunrpc/xprt.c	Thu Aug  1 12:13:09 2002
+++ linux-2.4.19-rpc_rtt3/net/sunrpc/xprt.c	Thu Aug  1 12:14:02 2002
@@ -76,6 +76,8 @@
 # define RPCDBG_FACILITY	RPCDBG_XPRT
 #endif
 
+#define XPRT_MAX_BACKOFF	(8)
+
 /*
  * Local functions
  */
@@ -937,6 +939,21 @@
 }
 
 /*
+ * Exponential backoff for UDP retries
+ */
+static inline int
+xprt_expbackoff(struct rpc_task *task, struct rpc_rqst *req)
+{
+	int backoff;
+
+	req->rq_ntimeo++;
+	backoff = min(rpc_ntimeo(&task->tk_client->cl_rtt), XPRT_MAX_BACKOFF);
+	if (req->rq_ntimeo < (1 << backoff))
+		return 1;
+	return 0;
+}
+
+/*
  * RPC receive timeout handler.
  */
 static void
@@ -948,9 +965,16 @@
 	spin_lock(&xprt->sock_lock);
 	if (req->rq_received)
 		goto out;
+
+	if (!xprt->nocong) {
+		if (xprt_expbackoff(task, req)) {
+			rpc_add_timer(task, xprt_timer);
+			goto out_unlock;
+		}
+		rpc_inc_timeo(&task->tk_client->cl_rtt);
+		xprt_adjust_cwnd(req->rq_xprt, -ETIMEDOUT);
+	}
 	req->rq_nresend++;
-	rpc_inc_timeo(&task->tk_client->cl_rtt);
-	xprt_adjust_cwnd(xprt, -ETIMEDOUT);
 
 	dprintk("RPC: %4d xprt_timer (%s request)\n",
 		task->tk_pid, req ? "pending" : "backlogged");
@@ -959,6 +983,7 @@
 out:
 	task->tk_timeout = 0;
 	rpc_wake_up_task(task);
+out_unlock:
 	spin_unlock(&xprt->sock_lock);
 }
 
@@ -1089,16 +1114,9 @@
 	dprintk("RPC: %4d xmit complete\n", task->tk_pid);
 	/* Set the task's receive timeout value */
 	if (!xprt->nocong) {
-		int backoff;
 		task->tk_timeout = rpc_calc_rto(&clnt->cl_rtt,
 				rpcproc_timer(clnt, task->tk_msg.rpc_proc));
-		/* If we are retransmitting, increment the timeout counter */
-		backoff = req->rq_nresend;
-		if (backoff) {
-			if (backoff > 7)
-				backoff = 7;
-			task->tk_timeout <<= backoff;
-		}
+		req->rq_ntimeo = 0;
 		if (task->tk_timeout > req->rq_timeout.to_maxval)
 			task->tk_timeout = req->rq_timeout.to_maxval;
 	} else