Welcome ng_deflate.

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 966df02..3ca841f 100644 (file)
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -218,6 +218,8 @@
         ..
         cisco
         ..
+        deflate
+        ..
         ether
         ..
         hole

diff --git a/include/Makefile b/include/Makefile
index 0278356..0f3dc7a 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -68,7 +68,7 @@ LSUBDIRS=     bus/cam bus/cam/scsi \
        netgraph/pppoe netgraph/pptpgre netgraph/rfc1490 netgraph/socket \
        netgraph/tee netgraph/tty netgraph/vjc \
        netgraph7/UI netgraph7/async netgraph7/atmllc netgraph7/bpf \
-       netgraph7/bridge netgraph7/cisco \
+       netgraph7/bridge netgraph7/cisco netgraph7/deflate \
        netgraph7/ether \
        netgraph7/hole \
        netgraph7/iface netgraph7/socket netgraph7/tee netgraph7/vjc \

diff --git a/lib/libnetgraph7/debug.c b/lib/libnetgraph7/debug.c
index 3f5ec10..f80d1f8 100644 (file)
--- a/lib/libnetgraph7/debug.c
+++ b/lib/libnetgraph7/debug.c
@@ -60,44 +60,43 @@
 #include <netgraph7/async/ng_async.h>
 #include <netgraph7/atmllc/ng_atmllc.h>
 #include <netgraph7/bpf/ng_bpf.h>
-/*
 #include <netgraph/bridge/ng_bridge.h>
-*/
 #include <netgraph7/cisco/ng_cisco.h>
+#include <netgraph7/deflate/ng_deflate.h>
 /*
-#include <netgraph/echo/ng_echo.h>
-#include <netgraph/eiface/ng_eiface.h>
-#include <netgraph/etf/ng_etf.h>
+#include <netgraph7/echo/ng_echo.h>
+#include <netgraph7/eiface/ng_eiface.h>
+#include <netgraph7/etf/ng_etf.h>
 */
 #include <netgraph7/ether/ng_ether.h>
 /*
-#include <netgraph/fec/ng_fec.h>
-#include <netgraph/frame_relay/ng_frame_relay.h>
+#include <netgraph7/fec/ng_fec.h>
+#include <netgraph7/frame_relay/ng_frame_relay.h>
 */
 #include <netgraph7/hole/ng_hole.h>
 /*
-#include <netgraph/hub/ng_hub.h>
+#include <netgraph7/hub/ng_hub.h>
 */
 #include <netgraph7/iface/ng_iface.h>
 /*
-#include <netgraph/ip_input/ng_ip_input.h>
-#include <netgraph/ksocket/ng_ksocket.h>
-#include <netgraph/l2tp/ng_l2tp.h>
-#include <netgraph/lmi/ng_lmi.h>
-#include <netgraph/mppc/ng_mppc.h>
-#include <netgraph/one2many/ng_one2many.h>
-#include <netgraph/ppp/ng_ppp.h>
-#include <netgraph/pppoe/ng_pppoe.h>
-#include <netgraph/pptpgre/ng_pptpgre.h>
-#include <netgraph/rfc1490/ng_rfc1490.h>
-#include <netgraph/socket/ng_socket.h>
-#include <netgraph/source/ng_source.h>
-#include <netgraph/split/ng_split.h>
-#include <netgraph/tcpmss/ng_tcpmss.h>
+#include <netgraph7/ip_input/ng_ip_input.h>
+#include <netgraph7/ksocket/ng_ksocket.h>
+#include <netgraph7/l2tp/ng_l2tp.h>
+#include <netgraph7/lmi/ng_lmi.h>
+#include <netgraph7/mppc/ng_mppc.h>
+#include <netgraph7/one2many/ng_one2many.h>
+#include <netgraph7/ppp/ng_ppp.h>
+#include <netgraph7/pppoe/ng_pppoe.h>
+#include <netgraph7/pptpgre/ng_pptpgre.h>
+#include <netgraph7/rfc1490/ng_rfc1490.h>
+#include <netgraph7/socket/ng_socket.h>
+#include <netgraph7/source/ng_source.h>
+#include <netgraph7/split/ng_split.h>
+#include <netgraph7/tcpmss/ng_tcpmss.h>
 */
 #include <netgraph7/tee/ng_tee.h>
 /*
-#include <netgraph/tty/ng_tty.h>
+#include <netgraph7/tty/ng_tty.h>
 */
 #include <netgraph7/vjc/ng_vjc.h>
 #ifdef WHISTLE
@@ -133,10 +132,9 @@ static const struct ng_cookie cookies[] = {
        COOKIE(ASYNC),
        COOKIE(ATMLLC),
        COOKIE(BPF),
-/*
        COOKIE(BRIDGE),
-*/
        COOKIE(CISCO),
+       COOKIE(DEFLATE),
 /*
        COOKIE(ECHO),
        COOKIE(EIFACE),

diff --git a/sys/conf/files b/sys/conf/files
index 0af29e3..8d74985 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1308,7 +1308,7 @@ netgraph7/bpf/ng_bpf.c            optional netgraph7_bpf
 netgraph7/bridge/ng_bridge.c   optional netgraph7_bridge
 netgraph7/ng_car.c             optional netgraph7_car
 netgraph7/cisco/ng_cisco.c     optional netgraph7_cisco
-netgraph7/ng_deflate.c         optional netgraph7_deflate
+netgraph7/deflate/ng_deflate.c optional netgraph7_deflate
 netgraph7/ng_device.c          optional netgraph7_device
 netgraph7/ng_echo.c            optional netgraph7_echo
 netgraph7/ng_eiface.c          optional netgraph7_eiface

diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
index 443e55c..5e2effb 100644 (file)
--- a/sys/netgraph7/Makefile
+++ b/sys/netgraph7/Makefile
@@ -8,6 +8,7 @@ SUBDIR= UI \
        bpf \
        bridge \
        cisco \
+       deflate \
        ether \
        hole \
        iface \

diff --git a/sys/netgraph7/deflate/Makefile b/sys/netgraph7/deflate/Makefile
new file mode 100644 (file)
index 0000000..9881231
--- /dev/null
+++ b/sys/netgraph7/deflate/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD: src/sys/modules/bpf/deflate/Makefile,v 1.2.4.3 2001/12/21 09:00:47 ru Exp $
+# $DragonFly: src/sys/netgraph/deflate/Makefile,v 1.3 2003/08/14 23:26:36 dillon Exp $
+# $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $
+
+KMOD=          ng_deflate
+SRCS=          ng_deflate.c
+KMODDEPS=      netgraph
+
+.include <bsd.kmod.mk>

diff --git a/sys/netgraph7/ng_deflate.c b/sys/netgraph7/deflate/ng_deflate.c
similarity index 99%
rename from sys/netgraph7/ng_deflate.c
rename to sys/netgraph7/deflate/ng_deflate.c
index a651162..f40064b 100644 (file)
--- a/sys/netgraph7/ng_deflate.c
+++ b/sys/netgraph7/deflate/ng_deflate.c
@@ -42,9 +42,9 @@
 
 #include <net/zlib.h>
 
-#include "ng_message.h"
-#include "netgraph.h"
-#include "ng_parse.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/netgraph.h>
+#include <netgraph7/ng_parse.h>
 #include "ng_deflate.h"
 
 #include "opt_netgraph.h"

diff --git a/sys/netgraph7/ng_deflate.h b/sys/netgraph7/deflate/ng_deflate.h
similarity index 100%
rename from sys/netgraph7/ng_deflate.h
rename to sys/netgraph7/deflate/ng_deflate.h