From e966498510aab0e9decd97b584ec48cead3efd17 Mon Sep 17 00:00:00 2001
From: Nuno Antunes <nuno.antunes@gmail.com>
Date: Sat, 18 Sep 2010 12:20:12 +0100
Subject: [PATCH] netgraph7: Welcome ng_pppoe.

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

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 9d2aa8fb50..a2c977a760 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -244,6 +244,8 @@
         ..
         ppp
         ..
+        pppoe
+        ..
         pptpgre
         ..
         socket
diff --git a/include/Makefile b/include/Makefile
index 042cfcb689..afd000f28b 100644
--- 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/one2many netgraph7/ppp \
+	netgraph7/mppc netgraph7/one2many netgraph7/ppp netgraph7/pppoe \
 	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 a06a409441..d531adfce2 100644
--- a/lib/libnetgraph7/debug.c
+++ b/lib/libnetgraph7/debug.c
@@ -87,9 +87,7 @@
 #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>
@@ -164,9 +162,7 @@ static const struct ng_cookie cookies[] = {
 	COOKIE(MPPC),
 	COOKIE(ONE2MANY),
 	COOKIE(PPP),
-/*
 	COOKIE(PPPOE),
-*/
 	COOKIE(PPTPGRE),
 /*
 	COOKIE(RFC1490),
diff --git a/sys/conf/files b/sys/conf/files
index 59ac1a10a6..de1145efb9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1331,7 +1331,7 @@ netgraph7/ng_nat.c		optional netgraph7_nat
 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
+netgraph7/pppoe/ng_pppoe.c	optional netgraph7_pppoe
 netgraph7/pptpgre/ng_pptpgre.c	optional netgraph7_pptpgre
 netgraph7/ng_pred1.c		optional netgraph7_pred1
 netgraph7/ng_rfc1490.c		optional netgraph7_rfc1490
diff --git a/sys/netgraph7/Makefile b/sys/netgraph7/Makefile
index e9b3b35dc3..984cc7cd95 100644
--- a/sys/netgraph7/Makefile
+++ b/sys/netgraph7/Makefile
@@ -22,6 +22,7 @@ SUBDIR=	UI \
 	netgraph \
 	one2many \
 	ppp \
+	pppoe \
 	pptpgre \
 	socket \
 	tee \
@@ -29,7 +30,6 @@ SUBDIR=	UI \
 #	eiface \
 #	fec \
 #	netgraph \
-#	pppoe \
 #	rfc1490 \
 #	socket \
 #	sync_ar \
diff --git a/sys/netgraph7/pppoe/Makefile b/sys/netgraph7/pppoe/Makefile
new file mode 100644
index 0000000000..bc7c0a3551
--- /dev/null
+++ b/sys/netgraph7/pppoe/Makefile
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/pppoe/Makefile,v 1.1.4.3 2001/12/21 09:00:49 ru Exp $
+# $DragonFly: src/sys/netgraph/pppoe/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_pppoe
+SRCS= 		ng_pppoe.c
+
+.include <bsd.kmod.mk>
diff --git a/sys/netgraph7/ng_pppoe.c b/sys/netgraph7/pppoe/ng_pppoe.c
similarity index 99%
rename from sys/netgraph7/ng_pppoe.c
rename to sys/netgraph7/pppoe/ng_pppoe.c
index 197cc0f77e..a4e241fe24 100644
--- a/sys/netgraph7/ng_pppoe.c
+++ b/sys/netgraph7/pppoe/ng_pppoe.c
@@ -52,11 +52,11 @@
 #include <sys/syslog.h>
 #include <net/ethernet.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_pppoe.h"
-#include "ng_ether.h"
+#include <netgraph7/ether/ng_ether.h>
 
 #ifdef NG_SEPARATE_MALLOC
 MALLOC_DEFINE(M_NETGRAPH_PPPOE, "netgraph_pppoe", "netgraph pppoe node");
diff --git a/sys/netgraph7/ng_pppoe.h b/sys/netgraph7/pppoe/ng_pppoe.h
similarity index 100%
rename from sys/netgraph7/ng_pppoe.h
rename to sys/netgraph7/pppoe/ng_pppoe.h
-- 
2.41.0