From b5f8af2bbdc364088c3803a357dfc4ad44a64154 Mon Sep 17 00:00:00 2001 From: Chas Williams Date: Mon, 12 Jun 2006 05:25:24 +0000 Subject: [PATCH] STABLE14-recvackpkt-count-acks-and-open-cong-window-20060612 "the non AFS_GLOBAL_RXLOCK_KERNEL version of rxi_ReceiveAckPacket() wasnt counting 'hard' acks and not opening the congestion window. using rx_Readv() directs the incoming packets into the target iov, and sends a hard ack (skipping soft acks). " (cherry picked from commit b365b06d34a9450dc53ad22e8ecb3f6d922af5f4) --- src/rx/rx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rx/rx.c b/src/rx/rx.c index 2d79a1911..55e3dc40a 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -3550,6 +3550,9 @@ rxi_ReceiveAckPacket(register struct rx_call *call, struct rx_packet *np, if (serial && (tp->header.serial == serial || tp->firstSerial == serial)) rxi_ComputePeerNetStats(call, tp, ap, np); + if (!(tp->flags & RX_PKTFLAG_ACKED)) { + newAckCount++; + } #ifdef AFS_GLOBAL_RXLOCK_KERNEL /* XXX Hack. Because we have to release the global rx lock when sending * packets (osi_NetSend) we drop all acks while we're traversing the tq @@ -3560,9 +3563,6 @@ rxi_ReceiveAckPacket(register struct rx_call *call, struct rx_packet *np, * set the ack bits in the packets and have rxi_Start remove the packets * when it's done transmitting. */ - if (!(tp->flags & RX_PKTFLAG_ACKED)) { - newAckCount++; - } if (call->flags & RX_CALL_TQ_BUSY) { #ifdef RX_ENABLE_LOCKS tp->flags |= RX_PKTFLAG_ACKED; -- 2.39.5