STABLE14-rx-send-req-ack-20070516

FIXES 60046

change reply code where appropriate

(cherry picked from commit a900fe30894b5c1bf3a55f2f539179c75c177dad)

diff --git a/src/rx/rx.c b/src/rx/rx.c
index 48ef3dda4ffea208cf940ff8d6f7242e4dc37677..87737551a9889b7c3fb9b04939b33b724bce9be3 100644 (file)
--- 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) {