From 7644d02f258cd2dfd880d7d52c2f41b2eb2ce870 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Sun, 14 Dec 2014 15:12:04 -0500 Subject: [PATCH] rx: rxi_SendPacketList remove duplicate conditional Presumably these checks were different at some point in the past. Change-Id: I0fb8737404a3c4fa786ab7965b60d35328d0bf32 Reviewed-on: http://gerrit.openafs.org/11632 Reviewed-by: Jeffrey Altman Tested-by: BuildBot Reviewed-by: Daria Brashear --- src/rx/rx_packet.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 4822a358eb..2c51036898 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -2347,19 +2347,17 @@ rxi_SendPacketList(struct rx_call *call, struct rx_connection *conn, conn->serial += len; for (i = 0; i < len; i++) { p = list[i]; + /* a ping *or* a sequenced packet can count */ if (p->length > conn->peer->maxPacketSize) { - /* a ping *or* a sequenced packet can count */ - if ((p->length > conn->peer->maxPacketSize)) { - if (((p->header.type == RX_PACKET_TYPE_ACK) && - (p->header.flags & RX_REQUEST_ACK)) && - ((i == 0) || (p->length >= conn->lastPingSize))) { - conn->lastPingSize = p->length; - conn->lastPingSizeSer = serial + i; - } else if ((p->header.seq != 0) && - ((i == 0) || (p->length >= conn->lastPacketSize))) { - conn->lastPacketSize = p->length; - conn->lastPacketSizeSeq = p->header.seq; - } + if (((p->header.type == RX_PACKET_TYPE_ACK) && + (p->header.flags & RX_REQUEST_ACK)) && + ((i == 0) || (p->length >= conn->lastPingSize))) { + conn->lastPingSize = p->length; + conn->lastPingSizeSer = serial + i; + } else if ((p->header.seq != 0) && + ((i == 0) || (p->length >= conn->lastPacketSize))) { + conn->lastPacketSize = p->length; + conn->lastPacketSizeSeq = p->header.seq; } } }