summaryrefslogtreecommitdiff
path: root/usr.sbin/ppp
diff options
context:
space:
mode:
authorbrian <brian@cvs.openbsd.org>2000-06-24 23:38:31 +0000
committerbrian <brian@cvs.openbsd.org>2000-06-24 23:38:31 +0000
commitd95d2c530183e0aaa130cacc98107bbde3634ac5 (patch)
treed299afbc55105c1783d9733d065b0b0520443bbd /usr.sbin/ppp
parent2786a99eda50da017c86e3369da306719b17f0e6 (diff)
Don't assign an MTU based on the peers first-link MRU in MP mode.
Use the peers MRRU as we're supposed to.
Diffstat (limited to 'usr.sbin/ppp')
-rw-r--r--usr.sbin/ppp/ppp/lcp.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/ppp/ppp/lcp.c b/usr.sbin/ppp/ppp/lcp.c
index d7f796c1c5e..e911e2a207b 100644
--- a/usr.sbin/ppp/ppp/lcp.c
+++ b/usr.sbin/ppp/ppp/lcp.c
@@ -17,7 +17,7 @@
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * $OpenBSD: lcp.c,v 1.19 2000/02/27 01:38:27 brian Exp $
+ * $OpenBSD: lcp.c,v 1.20 2000/06/24 23:38:30 brian Exp $
*
*/
@@ -574,15 +574,14 @@ LcpDecodeConfig(struct fsm *fp, u_char *cp, int plen, int mode_type,
/* Ignore his previous reject so that we REQ next time */
lcp->his_reject &= ~(1 << type);
- mtu = lcp->fsm.bundle->cfg.mtu;
- if (mru < MIN_MRU || mru < mtu) {
- /* Push him up to MTU or MIN_MRU */
- lcp->his_mrru = mru < mtu ? mtu : MIN_MRU;
+ if (mru < MIN_MRU) {
+ /* Push him up to MIN_MRU */
+ lcp->his_mrru = MIN_MRU;
memcpy(dec->nakend, cp, 2);
ua_htons(&lcp->his_mrru, dec->nakend + 2);
dec->nakend += 4;
} else {
- lcp->his_mrru = mtu ? mtu : mru;
+ lcp->his_mrru = mru;
memcpy(dec->ackend, cp, 4);
dec->ackend += 4;
}