Index: ip.c
===================================================================
--- ip.c
+++ ip.c
@@ -416,8 +416,13 @@
 	while ((getsecs() - t) < tleft) {
 		errno = 0;
 		ret = readipv4(d, pkt, payload, tleft, proto);
+		if (ret >= 0)
+			return (ret);
+		/* Bubble up the error if it wasn't successful */
 		if (errno != EAGAIN)
-			break;
+			return (-1);
 	}
-	return (ret);
+	/* We've exhausted tleft; timeout */
+	errno = ETIMEDOUT;
+	return (-1);
 }
Index: net.c
===================================================================
--- net.c
+++ net.c
@@ -118,7 +118,7 @@
 		/* Try to get a packet and process it. */
 		cc = (*rproc)(d, pkt, payload, tleft);
 		/* Return on data, EOF or real error. */
-		if (cc != -1 || errno != 0)
+		if (cc != -1 || (errno != 0 && errno != ETIMEDOUT))
 			return (cc);
 
 		/* Timed out or didn't get the packet we're waiting for */
Index: tftp.c
===================================================================
--- tftp.c
+++ tftp.c
@@ -623,7 +623,7 @@
 #endif
 
 	tleft = MINTMO;
-	t = t1 = getsecs();
+	t = getsecs();
 	for (;;) {
 		if ((getsecs() - t) > MAXTMO) {
 			errno = ETIMEDOUT;
@@ -638,14 +638,20 @@
 		if (cc == -1) {
 			/* Error on transmit; wait before retrying */
 			while ((getsecs() - t1) < tleft);
+			t1 = getsecs();
 			continue;
 		}
 
+		t = t1 = getsecs();
 recvnext:
+		if ((getsecs() - t) > MAXTMO) {
+			errno = ETIMEDOUT;
+			return -1;
+		}
 		/* Try to get a packet and process it. */
 		cc = (*rproc)(h, pkt, payload, tleft, rtype);
 		/* Return on data, EOF or real error. */
-		if (cc != -1 || errno != 0)
+		if (cc != -1 || (errno != 0 && errno != ETIMEDOUT))
 			return (cc);
 		if ((getsecs() - t1) < tleft) {
 		    goto recvnext;