From 3bd269b18ce4a22b4921423a2db31d69f87dd92b Mon Sep 17 00:00:00 2001
From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Wed, 16 May 2007 21:39:09 +0000
Subject: [PATCH] STABLE14-rx-send-req-ack-20070516

FIXES 60046

change reply code where appropriate


(cherry picked from commit a900fe30894b5c1bf3a55f2f539179c75c177dad)
---
 src/rx/rx.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 48ef3dda4f..87737551a9 100644
--- a/src/rx/rx.c
+++ b/src/rx/rx.c
@@ -3346,9 +3346,11 @@ rxi_ReceiveDataPacket(register struct rx_call *call,
 
 	    /* We need to send an ack of the packet is out of sequence, 
 	     * or if an ack was requested by the peer. */
-	    if (seq != prev + 1 || missing || (flags & RX_REQUEST_ACK)) {
+	    if (seq != prev + 1 || missing) {
 		ackNeeded = RX_ACK_OUT_OF_SEQUENCE;
-	    }
+	    } else if (flags & RX_REQUEST_ACK) {
+		ackNeeded = RX_ACK_REQUESTED;
+            }
 
 	    /* Acknowledge the last packet for each call */
 	    if (flags & RX_LAST_PACKET) {