Apply upstream STABLE14-rx-idledead-only-ignore-keepalives-20081222

diff --git a/debian/changelog b/debian/changelog
index 5b578028ef1ad4d7111d3d02ef97e4e372aceb31..87c54072e76b708b18e5098bff31c89cec7622fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ openafs (1.4.8.dfsg1-1) UNRELEASED; urgency=low
       syscall probing.
     - STABLE14-linux-2629-20090115: support for 2.6.29 kernels.
       (Closes: #513680)
+    - STABLE14-rx-idledead-only-ignore-keepalives-20081222: rx bug fix to
+      not ignore other ping packets.
   * Make dynroot the default for new installations.  It works much better
     with systems that don't bring up their network until late in the boot
     process, such as wireless laptops.  (LP: #249240, #318605)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 3c0c711fcf64e4f254486306cd3882fe1b2229a6..7ad9e22e117548195b9c688f3703b0d81014d213 100644 (file)
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -17,7 +17,7 @@
 #endif
 
 RCSID
-    ("$Header: /cvs/openafs/src/rx/rx.c,v 1.58.2.53 2008/09/25 17:26:47 shadow Exp $");
+    ("$Header: /cvs/openafs/src/rx/rx.c,v 1.58.2.54 2008/12/22 17:15:00 shadow Exp $");
 
 #ifdef KERNEL
 #include "afs/sysincludes.h"
@@ -5380,7 +5380,7 @@ rxi_Send(register struct rx_call *call, register struct rx_packet *p,
      * idle connections) */
     conn->lastSendTime = call->lastSendTime = clock_Sec();
     /* Don't count keepalives here, so idleness can be tracked. */
-    if (p->header.type != RX_PACKET_TYPE_ACK)
+    if ((p->header.type != RX_PACKET_TYPE_ACK) || (((struct rx_ackPacket *)rx_DataOf(p))->reason != RX_ACK_PING))
        call->lastSendData = call->lastSendTime;
 }