From: Nuno Antunes <nuno.antunes@gmail.com>
Date: Fri, 9 Dec 2011 22:19:07 +0000 (+0000)
Subject: netgraph7: welcome ng_hub.
X-Git-Tag: v3.0.0~106
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/178c5ad4e532e4c68b8148c2477e411ba3639acb

netgraph7: welcome ng_hub.
---

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index a2c977a760..65d4b90a39 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -230,6 +230,8 @@
         ..
         hole
         ..
+        hub
+        ..
         iface
         ..
         ksocket
diff --git a/include/Makefile b/include/Makefile
index afd000f28b..7f0a41a855 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -70,6 +70,7 @@ LSUBDIRS=	bus/cam bus/cam/scsi \
 	netgraph7/UI netgraph7/async netgraph7/atmllc netgraph7/bpf \
 	netgraph7/bridge netgraph7/cisco netgraph7/deflate netgraph7/echo \
 	netgraph7/etf netgraph7/ether netgraph7/frame_relay netgraph7/hole \
+	netgraph7/hub \
 	netgraph7/iface netgraph7/ksocket netgraph7/l2tp netgraph7/lmi \
 	netgraph7/mppc netgraph7/one2many netgraph7/ppp netgraph7/pppoe \
 	netgraph7/pptpgre netgraph7/socket netgraph7/tee netgraph7/vjc \
diff --git a/lib/libnetgraph7/debug.c b/lib/libnetgraph7/debug.c
index d531adfce2..9934d3a19f 100644
--- a/lib/libnetgraph7/debug.c
+++ b/lib/libnetgraph7/debug.c
@@ -74,9 +74,7 @@
 */
 #include <netgraph7/frame_relay/ng_frame_relay.h>
 #include <netgraph7/hole/ng_hole.h>
-/*
 #include <netgraph7/hub/ng_hub.h>
-*/
 #include <netgraph7/iface/ng_iface.h>
 /*
 #include <netgraph7/ip_input/ng_ip_input.h>
@@ -149,9 +147,7 @@ static const struct ng_cookie cookies[] = {
 	COOKIE(FRAMERELAY),
 	COOKIE(GENERIC),
 	COOKIE(HOLE),
-/*
 	COOKIE(HUB),
-*/
 	COOKIE(IFACE),
 /*
 	COOKIE(IP_INPUT),
diff --git a/sys/conf/files b/sys/conf/files
index 6bb2eb4760..77150b5cc1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1318,6 +1318,7 @@ netgraph7/frame_relay/ng_frame_relay.c			optional netgraph7_frame_relay
 netgraph7/ng_gif.c		optional netgraph7_gif
 netgraph7/ng_gif_demux.c	optional netgraph7_gif_demux
 netgraph7/hole/ng_hole.c	optional netgraph7_hole
+netgraph7/hub/ng_hub.c		optional netgraph7_hub
 netgraph7/iface/ng_iface.c	optional netgraph7_iface
 netgraph7/ng_ip_input.c		optional netgraph7_ip_input
 netgraph7/ng_ipfw.c		optional netgraph7_ipfw
diff --git a/sys/conf/options b/sys/conf/options
index b9da8bb35b..00af8194db 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -354,6 +354,7 @@ NETGRAPH7_FRAME_RELAY	opt_netgraph.h
 NETGRAPH7_GIF		opt_netgraph.h
 NETGRAPH7_GIF_DEMUX	opt_netgraph.h
 NETGRAPH7_HOLE		opt_netgraph.h
+NETGRAPH7_HUB		opt_netgraph.h
 NETGRAPH7_IFACE		opt_netgraph.h
 NETGRAPH7_IP_INPUT	opt_netgraph.h
 NETGRAPH7_IPFW		opt_netgraph.h
diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
index 984cc7cd95..95a528c433 100644
--- a/sys/netgraph7/Makefile
+++ b/sys/netgraph7/Makefile
@@ -14,6 +14,7 @@ SUBDIR=	UI \
 	ether \
 	frame_relay \
 	hole \
+	hub \
 	iface \
 	ksocket \
 	l2tp \
diff --git a/sys/netgraph7/hub/Makefile b/sys/netgraph7/hub/Makefile
new file mode 100644
index 0000000000..71c5351525
--- /dev/null
+++ b/sys/netgraph7/hub/Makefile
@@ -0,0 +1,4 @@
+KMOD=		ng_hub
+SRCS= 		ng_hub.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/netgraph7/ng_hub.c b/sys/netgraph7/hub/ng_hub.c
similarity index 97%
rename from sys/netgraph7/ng_hub.c
rename to sys/netgraph7/hub/ng_hub.c
index 694ea3b1ad..254f442515 100644
--- a/sys/netgraph7/ng_hub.c
+++ b/sys/netgraph7/hub/ng_hub.c
@@ -33,9 +33,9 @@
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 
-#include "ng_message.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/netgraph.h>
 #include "ng_hub.h"
-#include "netgraph.h"
 
 static ng_constructor_t	ng_hub_constructor;
 static ng_rcvdata_t	ng_hub_rcvdata;
diff --git a/sys/netgraph7/ng_hub.h b/sys/netgraph7/hub/ng_hub.h
similarity index 100%
rename from sys/netgraph7/ng_hub.h
rename to sys/netgraph7/hub/ng_hub.h