netgraph7: Welcome ng_pppoe.
authorNuno Antunes <nuno.antunes@gmail.com>
Sat, 18 Sep 2010 11:20:12 +0000 (12:20 +0100)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:33 +0000 (14:10 +0000)
etc/mtree/BSD.include.dist
include/Makefile
lib/libnetgraph7/debug.c
sys/conf/files
sys/netgraph7/Makefile
sys/netgraph7/pppoe/Makefile [new file with mode: 0644]
sys/netgraph7/pppoe/ng_pppoe.c [moved from sys/netgraph7/ng_pppoe.c with 99% similarity]
sys/netgraph7/pppoe/ng_pppoe.h [moved from sys/netgraph7/ng_pppoe.h with 100% similarity]

index 9d2aa8f..a2c977a 100644 (file)
         ..
         ppp
         ..
+        pppoe
+        ..
         pptpgre
         ..
         socket
index 042cfcb..afd000f 100644 (file)
@@ -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 \
index a06a409..d531adf 100644 (file)
@@ -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),
index 59ac1a1..de1145e 100644 (file)
@@ -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
index e9b3b35..984cc7c 100644 (file)
@@ -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 (file)
index 0000000..bc7c0a3
--- /dev/null
@@ -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>
similarity index 99%
rename from sys/netgraph7/ng_pppoe.c
rename to sys/netgraph7/pppoe/ng_pppoe.c
index 197cc0f..a4e241f 100644 (file)
 #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");