From bb091a26ed84f42a24446e0fdbc5da8048684275 Mon Sep 17 00:00:00 2001
From: Nuno Antunes <nuno.antunes@gmail.com>
Date: Fri, 17 Sep 2010 01:05:47 +0100
Subject: [PATCH] netgraph7: Welcome ng_etf.

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

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index fd65107cda..0c5624b673 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -222,6 +222,8 @@
         ..
         echo
         ..
+        etf
+        ..
         ether
         ..
         hole
diff --git a/include/Makefile b/include/Makefile
index b7751d30aa..d9f06584c7 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/ether netgraph7/hole \
+	netgraph7/etf netgraph7/ether 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 6bb8f7c85e..a2ce88c984 100644
--- a/lib/libnetgraph7/debug.c
+++ b/lib/libnetgraph7/debug.c
@@ -66,8 +66,8 @@
 #include <netgraph7/echo/ng_echo.h>
 /*
 #include <netgraph7/eiface/ng_eiface.h>
-#include <netgraph7/etf/ng_etf.h>
 */
+#include <netgraph7/etf/ng_etf.h>
 #include <netgraph7/ether/ng_ether.h>
 /*
 #include <netgraph7/fec/ng_fec.h>
@@ -142,8 +142,8 @@ static const struct ng_cookie cookies[] = {
 	COOKIE(ECHO),
 /*
 	COOKIE(EIFACE),
-	COOKIE(ETF),
 */
+	COOKIE(ETF),
 	COOKIE(ETHER),
 /*
 	COOKIE(FEC),
diff --git a/sys/conf/files b/sys/conf/files
index f39b2ff53e..17d696938d 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1312,6 +1312,7 @@ netgraph7/deflate/ng_deflate.c	optional netgraph7_deflate
 netgraph7/ng_device.c		optional netgraph7_device
 netgraph7/echo/ng_echo.c	optional netgraph7_echo
 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
diff --git a/sys/conf/options b/sys/conf/options
index ca1eb9884c..b9da8bb35b 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -347,6 +347,7 @@ NETGRAPH7_DEFLATE	opt_netgraph.h
 NETGRAPH7_DEVICE	opt_netgraph.h
 NETGRAPH7_ECHO		opt_netgraph.h
 NETGRAPH7_EIFACE	opt_netgraph.h
+NETGRAPH7_ETF		opt_netgraph.h
 NETGRAPH7_ETHER		opt_netgraph.h
 NETGRAPH7_FEC		opt_netgraph.h
 NETGRAPH7_FRAME_RELAY	opt_netgraph.h
diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
index 87d5515869..0ee03fce15 100644
--- a/sys/netgraph7/Makefile
+++ b/sys/netgraph7/Makefile
@@ -10,6 +10,7 @@ SUBDIR=	UI \
 	cisco \
 	deflate \
 	echo \
+	etf \
 	ether \
 	hole \
 	iface \
@@ -20,7 +21,6 @@ SUBDIR=	UI \
 	tee \
 	vjc
 #	eiface \
-#	etf \
 #	fec \
 #	frame_relay \
 #	l2tp \
diff --git a/sys/netgraph7/etf/Makefile b/sys/netgraph7/etf/Makefile
new file mode 100644
index 0000000000..b4ed7bd7e1
--- /dev/null
+++ b/sys/netgraph7/etf/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/etf/Makefile,v 1.2.2.1 2002/04/09 20:06:39 julian Exp $
+# $DragonFly: src/sys/netgraph/etf/Makefile,v 1.2 2003/06/17 04:28:46 dillon Exp $
+# Ethertype filter
+
+KMOD=	ng_etf
+SRCS= 	ng_etf.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/netgraph7/ng_etf.c b/sys/netgraph7/etf/ng_etf.c
similarity index 99%
rename from sys/netgraph7/ng_etf.c
rename to sys/netgraph7/etf/ng_etf.c
index 8c52f2314f..bfdf91c7ac 100644
--- a/sys/netgraph7/ng_etf.c
+++ b/sys/netgraph7/etf/ng_etf.c
@@ -46,10 +46,10 @@
 
 #include <net/ethernet.h>
 
-#include "ng_message.h"
-#include "ng_parse.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/ng_parse.h>
 #include "ng_etf.h"
-#include "netgraph.h"
+#include <netgraph7/netgraph.h>
 
 /* If you do complicated mallocs you may want to do this */
 /* and use it for your mallocs */
diff --git a/sys/netgraph7/ng_etf.h b/sys/netgraph7/etf/ng_etf.h
similarity index 100%
rename from sys/netgraph7/ng_etf.h
rename to sys/netgraph7/etf/ng_etf.h
-- 
2.41.0