From: Jeffrey Hutzelman <jhutz@cmu.edu>
Date: Fri, 23 May 2008 15:56:54 +0000 (+0000)
Subject: STABLE14-rx-client-keep-keepalives-20080523
X-Git-Tag: openafs-stable-1_4_8pre1~81
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=05369aa5551ac6913a4079be7d85ef04c2b76f52;p=packages%2Fo%2Fopenafs.git

STABLE14-rx-client-keep-keepalives-20080523

LICENSE IPL10
FIXES 20727

not our bug, but, previous code refactoring broke rx. put back keepalives in cli
ent rx connections while they are turned around.


(cherry picked from commit b1549f29a9515de09d4a64bfb28bf5afdfee2615)
---

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 1f5b71c28..3f45c0469 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -2914,6 +2914,7 @@ rxi_ReceivePacket(register struct rx_packet *np, osi_socket socket,
 	}
 #endif /* AFS_GLOBAL_RXLOCK_KERNEL */
 	rxi_ClearTransmitQueue(call, 0);
+	rxevent_Cancel(call->keepAliveEvent, call, RX_CALL_REFCOUNT_ALIVE);
 	break;
     default:
 	/* Should not reach here, unless the peer is broken: send an abort