From: Derrick Brashear <shadow@dementia.org>
Date: Sun, 20 Jan 2002 05:43:48 +0000 (+0000)
Subject: STABLE12-revert-rx-deal-with-missed-keepalives-by-accurately-tracking-call-number... 
X-Git-Tag: openafs-stable-1_2_3~51
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c7b48baec9b9d295c83ee908d8d710c1ec14ee0a;p=packages%2Fo%2Fopenafs.git

STABLE12-revert-rx-deal-with-missed-keepalives-by-accurately-tracking-call-number-20020120


interferes at least with some versions of linux


(cherry picked from commit 698cb3037622b2bf294d64a3fc896a97af21138d)
---

diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c
index c2ecbc578..8b7051eca 100644
--- a/src/rx/rx_packet.c
+++ b/src/rx/rx_packet.c
@@ -1772,6 +1772,10 @@ rxi_SendSpecial(call, conn, optionalPacket, type, data, nbytes, istack)
     if (call) {
 	channel = call->channel;
 	callNumber = *call->callNumber;
+	/* BUSY packets refer to the next call on this connection */
+	if (type == RX_PACKET_TYPE_BUSY) {
+	    callNumber++;
+	}
     } else {
 	channel = 0;
 	callNumber = 0;
@@ -1780,12 +1784,6 @@ rxi_SendSpecial(call, conn, optionalPacket, type, data, nbytes, istack)
     if (!p) {
 	p = rxi_AllocPacket(RX_PACKET_CLASS_SPECIAL);
 	if (!p) osi_Panic("rxi_SendSpecial failure");
-    } else if (type == RX_PACKET_TYPE_BUSY) {
-	/* BUSY packets refer to some subsequent call on this connection
-	 * and we need to match the callNumber used by the other side. */
-	if (p->header.callNumber > callNumber) {
-	    callNumber = p->header.callNumber;
-	}
     }
 
     if (nbytes != -1)