netgraph7: Welcome ng_one2many.

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index ad933e5..9d2aa8f 100644 (file)
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -240,6 +240,8 @@
         ..
         mppc
         ..
+        one2many
+        ..
         ppp
         ..
         pptpgre

diff --git a/include/Makefile b/include/Makefile
index a1962b4..042cfcb 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -71,7 +71,7 @@ LSUBDIRS=     bus/cam bus/cam/scsi \
        netgraph7/bridge netgraph7/cisco netgraph7/deflate netgraph7/echo \
        netgraph7/etf netgraph7/ether netgraph7/frame_relay netgraph7/hole \
        netgraph7/iface netgraph7/ksocket netgraph7/l2tp netgraph7/lmi \
-       netgraph7/mppc netgraph7/ppp \
+       netgraph7/mppc netgraph7/one2many netgraph7/ppp \
        netgraph7/pptpgre netgraph7/socket netgraph7/tee netgraph7/vjc \
        bus/cam bus/usb bus/pccard bus/pci bus/isa bus/ppbus bus/smbus \
        netproto/atm netproto/ipsec netproto/ipx \

diff --git a/lib/libnetgraph7/debug.c b/lib/libnetgraph7/debug.c
index 6dbb930..a06a409 100644 (file)
--- a/lib/libnetgraph7/debug.c
+++ b/lib/libnetgraph7/debug.c
@@ -85,9 +85,7 @@
 #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>
@@ -164,9 +162,7 @@ static const struct ng_cookie cookies[] = {
        COOKIE(L2TP),
        COOKIE(LMI),
        COOKIE(MPPC),
-/*
        COOKIE(ONE2MANY),
-*/
        COOKIE(PPP),
 /*
        COOKIE(PPPOE),

diff --git a/sys/conf/files b/sys/conf/files
index f2e158e..59ac1a1 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1328,7 +1328,7 @@ netgraph7/lmi/ng_lmi.c            optional netgraph7_lmi
 netgraph7/mppc/ng_mppc.c       optional netgraph7_mppc_compression
 netgraph7/mppc/ng_mppc.c       optional netgraph7_mppc_encryption
 netgraph7/ng_nat.c             optional netgraph7_nat
-netgraph7/ng_one2many.c                optional netgraph7_one2many
+netgraph7/one2many/ng_one2many.c                       optional netgraph7_one2many
 netgraph7/netgraph/ng_parse.c  optional netgraph7
 netgraph7/ppp/ng_ppp.c         optional netgraph7_ppp
 netgraph7/ng_pppoe.c           optional netgraph7_pppoe

diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
index bb9af38..e9b3b35 100644 (file)
--- a/sys/netgraph7/Makefile
+++ b/sys/netgraph7/Makefile
@@ -20,6 +20,7 @@ SUBDIR=       UI \
        lmi \
        mppc \
        netgraph \
+       one2many \
        ppp \
        pptpgre \
        socket \
@@ -28,7 +29,6 @@ SUBDIR=       UI \
 #      eiface \
 #      fec \
 #      netgraph \
-#      one2many \
 #      pppoe \
 #      rfc1490 \
 #      socket \

diff --git a/sys/netgraph7/one2many/Makefile b/sys/netgraph7/one2many/Makefile
new file mode 100644 (file)
index 0000000..7bfbc95
--- /dev/null
+++ b/sys/netgraph7/one2many/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD: src/sys/modules/netgraph/one2many/Makefile,v 1.1.2.1 2000/11/16 17:28:32 archie Exp $
+# $DragonFly: src/sys/netgraph/one2many/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+
+KMOD=          ng_one2many
+SRCS=          ng_one2many.c
+
+.include <bsd.kmod.mk>

diff --git a/sys/netgraph7/ng_one2many.c b/sys/netgraph7/one2many/ng_one2many.c
similarity index 99%
rename from sys/netgraph7/ng_one2many.c
rename to sys/netgraph7/one2many/ng_one2many.c
index 7b692b1..3ab57ff 100644 (file)
--- a/sys/netgraph7/ng_one2many.c
+++ b/sys/netgraph7/one2many/ng_one2many.c
@@ -57,9 +57,9 @@
 #include <sys/mbuf.h>
 #include <sys/errno.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_one2many.h"
 
 /* Per-link private data */

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