From owner-freebsd-current Fri Oct 13 6:36: 9 2000 Delivered-To: freebsd-current@freebsd.org Received: from critter.freebsd.dk (flutter.freebsd.dk [212.242.40.147]) by hub.freebsd.org (Postfix) with ESMTP id C6D8A37B503 for ; Fri, 13 Oct 2000 06:36:05 -0700 (PDT) Received: from critter (localhost [127.0.0.1]) by critter.freebsd.dk (8.11.0/8.9.3) with ESMTP id e9DDa4N00592 for ; Fri, 13 Oct 2000 15:36:04 +0200 (CEST) (envelope-from phk@critter.freebsd.dk) To: current@freebsd.org Subject: DO_DEFLATE / PPP_DEFLATE confusion ? From: Poul-Henning Kamp Date: Fri, 13 Oct 2000 15:36:04 +0200 Message-ID: <590.971444164@critter> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Can somebody please figure out if this option should be called DO_DEFLATE or PPP_DEFLATE please ?? Poul-Henning Index: conf/options =================================================================== RCS file: /home/ncvs/src/sys/conf/options,v retrieving revision 1.230 diff -u -r1.230 options --- conf/options 2000/10/03 18:06:24 1.230 +++ conf/options 2000/10/13 12:38:44 @@ -257,6 +257,8 @@ NETATALK opt_atalk.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h +DO_DEFLATE opt_ppp.h +DO_BSD_COMPRESS opt_ppp.h PPP_FILTER opt_ppp.h SLIP_IFF_OPTS opt_slip.h TCP_COMPAT_42 opt_compat.h Index: i386/conf/NOTES =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/NOTES,v retrieving revision 1.836 diff -u -r1.836 NOTES --- i386/conf/NOTES 2000/10/10 14:23:04 1.836 +++ i386/conf/NOTES 2000/10/13 12:34:02 @@ -498,6 +498,8 @@ options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support options PPP_FILTER #enable bpf filtering (needs bpf) +options DO_DEFLATE #??? +options DO_BSD_COMPRESS #??? device ef # Multiple ethernet frames support options ETHER_II # enable Ethernet_II frame Index: net/bsd_comp.c =================================================================== RCS file: /home/ncvs/src/sys/net/bsd_comp.c,v retrieving revision 1.11 diff -u -r1.11 bsd_comp.c --- net/bsd_comp.c 1999/08/28 00:48:14 1.11 +++ net/bsd_comp.c 2000/10/13 12:39:22 @@ -43,6 +43,7 @@ * $FreeBSD: src/sys/net/bsd_comp.c,v 1.11 1999/08/28 00:48:14 peter Exp $ */ +#include "opt_ppp.h" #include #include #include Index: net/ppp_deflate.c =================================================================== RCS file: /home/ncvs/src/sys/net/ppp_deflate.c,v retrieving revision 1.12 diff -u -r1.12 ppp_deflate.c --- net/ppp_deflate.c 1999/08/28 00:48:26 1.12 +++ net/ppp_deflate.c 2000/10/13 12:39:41 @@ -29,6 +29,7 @@ * OR MODIFICATIONS. */ +#include "opt_ppp.h" #include #include #include -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message