From 9a8e62257002ed5a1e221fe247278cba5f35f9eb Mon Sep 17 00:00:00 2001
From: Nuno Antunes <nuno.antunes@gmail.com>
Date: Fri, 17 Sep 2010 01:16:04 +0100
Subject: [PATCH] netgraph7: welcome ng_frame_relay.

---
 etc/mtree/BSD.include.dist                       | 2 ++
 include/Makefile                                 | 2 +-
 lib/libnetgraph7/debug.c                         | 4 ++--
 sys/conf/files                                   | 2 +-
 sys/netgraph7/Makefile                           | 2 +-
 sys/netgraph7/frame_relay/Makefile               | 8 ++++++++
 sys/netgraph7/{ => frame_relay}/ng_frame_relay.c | 4 ++--
 sys/netgraph7/{ => frame_relay}/ng_frame_relay.h | 0
 8 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 sys/netgraph7/frame_relay/Makefile
 rename sys/netgraph7/{ => frame_relay}/ng_frame_relay.c (99%)
 rename sys/netgraph7/{ => frame_relay}/ng_frame_relay.h (100%)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 0c5624b673..da321315a2 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -226,6 +226,8 @@
         ..
         ether
         ..
+        frame_relay
+        ..
         hole
         ..
         iface
diff --git a/include/Makefile b/include/Makefile
index d9f06584c7..fb4cc0ff7c 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -69,7 +69,7 @@ LSUBDIRS=	bus/cam bus/cam/scsi \
 	netgraph/tee netgraph/tty netgraph/vjc \
 	netgraph7/UI netgraph7/async netgraph7/atmllc netgraph7/bpf \
 	netgraph7/bridge netgraph7/cisco netgraph7/deflate netgraph7/echo \
-	netgraph7/etf netgraph7/ether netgraph7/hole \
+	netgraph7/etf netgraph7/ether netgraph7/frame_relay netgraph7/hole \
 	netgraph7/iface netgraph7/ksocket netgraph7/pptpgre \
 	netgraph7/socket netgraph7/tee netgraph7/vjc \
 	bus/cam bus/usb bus/pccard bus/pci bus/isa bus/ppbus bus/smbus \
diff --git a/lib/libnetgraph7/debug.c b/lib/libnetgraph7/debug.c
index a2ce88c984..72b7d15a60 100644
--- a/lib/libnetgraph7/debug.c
+++ b/lib/libnetgraph7/debug.c
@@ -71,8 +71,8 @@
 #include <netgraph7/ether/ng_ether.h>
 /*
 #include <netgraph7/fec/ng_fec.h>
-#include <netgraph7/frame_relay/ng_frame_relay.h>
 */
+#include <netgraph7/frame_relay/ng_frame_relay.h>
 #include <netgraph7/hole/ng_hole.h>
 /*
 #include <netgraph7/hub/ng_hub.h>
@@ -147,9 +147,9 @@ static const struct ng_cookie cookies[] = {
 	COOKIE(ETHER),
 /*
 	COOKIE(FEC),
+*/
 	COOKIE(FRAMERELAY),
 	COOKIE(GENERIC),
-*/
 	COOKIE(HOLE),
 /*
 	COOKIE(HUB),
diff --git a/sys/conf/files b/sys/conf/files
index 17d696938d..1b01a620fc 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1315,7 +1315,7 @@ netgraph7/ng_eiface.c		optional netgraph7_eiface
 netgraph7/etf/ng_etf.c		optional netgraph7_etf
 netgraph7/ether/ng_ether.c	optional netgraph7_ether
 netgraph7/ng_fec.c		optional netgraph7_fec
-netgraph7/ng_frame_relay.c	optional netgraph7_frame_relay
+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
diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
index 0ee03fce15..ed9c471150 100644
--- a/sys/netgraph7/Makefile
+++ b/sys/netgraph7/Makefile
@@ -12,6 +12,7 @@ SUBDIR=	UI \
 	echo \
 	etf \
 	ether \
+	frame_relay \
 	hole \
 	iface \
 	ksocket \
@@ -22,7 +23,6 @@ SUBDIR=	UI \
 	vjc
 #	eiface \
 #	fec \
-#	frame_relay \
 #	l2tp \
 #	lmi \
 #	netgraph \
diff --git a/sys/netgraph7/frame_relay/Makefile b/sys/netgraph7/frame_relay/Makefile
new file mode 100644
index 0000000000..7368865b4f
--- /dev/null
+++ b/sys/netgraph7/frame_relay/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/frame_relay/Makefile,v 1.1.4.3 2001/12/21 09:00:48 ru Exp $
+# $DragonFly: src/sys/netgraph/frame_relay/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# $Whistle: Makefile,v 1.1 1999/01/19 19:39:21 archie Exp $
+
+KMOD=		ng_frame_relay
+SRCS= 		ng_frame_relay.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/netgraph7/ng_frame_relay.c b/sys/netgraph7/frame_relay/ng_frame_relay.c
similarity index 99%
rename from sys/netgraph7/ng_frame_relay.c
rename to sys/netgraph7/frame_relay/ng_frame_relay.c
index 7eac40f53e..93e5480bf9 100644
--- a/sys/netgraph7/ng_frame_relay.c
+++ b/sys/netgraph7/frame_relay/ng_frame_relay.c
@@ -60,8 +60,8 @@
 #include <sys/syslog.h>
 #include <sys/ctype.h>
 
-#include "ng_message.h"
-#include "netgraph.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/netgraph.h>
 #include "ng_frame_relay.h"
 
 /*
diff --git a/sys/netgraph7/ng_frame_relay.h b/sys/netgraph7/frame_relay/ng_frame_relay.h
similarity index 100%
rename from sys/netgraph7/ng_frame_relay.h
rename to sys/netgraph7/frame_relay/ng_frame_relay.h
-- 
2.41.0