From f788100ad5199cf05b6ab7b38722de10d8135f23 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 22 Aug 2008 05:32:01 +0000 Subject: [PATCH] STABLE14-rx-allow-jumbogram-disabling-really-20080822 LICENSE IPL10 right now, jumbograms can still be sent when -nojumbo is specified. make the current macro a default and override when we're supposed to. (cherry picked from commit 46dbd678714110002a36269beca8961e013650ac) --- src/rx/rx_kcommon.c | 2 +- src/rx/rx_user.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index 3bfb388a8..7fa0e630b 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -479,7 +479,7 @@ rxi_InitPeerParams(register struct rx_peer *pp) pp->natMTU = MIN(pp->ifMTU, OLD_MAX_PACKET_SIZE); pp->ifDgramPackets = MIN(rxi_nDgramPackets, - rxi_AdjustDgramPackets(RX_MAX_FRAGS, pp->ifMTU)); + rxi_AdjustDgramPackets(rxi_nSendFrags, pp->ifMTU)); pp->maxDgramPackets = 1; /* Initialize slow start parameters */ diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index ebbe522b9..4ab3d3b26 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -665,10 +665,10 @@ rxi_InitPeerParams(struct rx_peer *pp) pp->natMTU = MIN((int)pp->ifMTU, OLD_MAX_PACKET_SIZE); pp->maxDgramPackets = MIN(rxi_nDgramPackets, - rxi_AdjustDgramPackets(RX_MAX_FRAGS, pp->ifMTU)); + rxi_AdjustDgramPackets(rxi_nSendFrags, pp->ifMTU)); pp->ifDgramPackets = MIN(rxi_nDgramPackets, - rxi_AdjustDgramPackets(RX_MAX_FRAGS, pp->ifMTU)); + rxi_AdjustDgramPackets(rxi_nSendFrags, pp->ifMTU)); pp->maxDgramPackets = 1; /* Initialize slow start parameters */ pp->MTU = MIN(pp->natMTU, pp->maxMTU); -- 2.39.5