netgraph7: Welcome ng_lmi.
authorNuno Antunes <nuno.antunes@gmail.com>
Fri, 17 Sep 2010 22:34:39 +0000 (23:34 +0100)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:31 +0000 (14:10 +0000)
etc/mtree/BSD.include.dist
include/Makefile
lib/libnetgraph7/debug.c
sys/conf/files
sys/netgraph7/Makefile
sys/netgraph7/lmi/Makefile [new file with mode: 0644]
sys/netgraph7/lmi/ng_lmi.c [moved from sys/netgraph7/ng_lmi.c with 99% similarity]
sys/netgraph7/lmi/ng_lmi.h [moved from sys/netgraph7/ng_lmi.h with 100% similarity]

index d6aa67b..42687de 100644 (file)
         ..
         l2tp
         ..
+        lmi
+        ..
         pptpgre
         ..
         socket
index 538007b..cd72e92 100644 (file)
@@ -70,8 +70,8 @@ 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/iface netgraph7/ksocket netgraph7/l2tp netgraph7/pptpgre \
-       netgraph7/socket netgraph7/tee netgraph7/vjc \
+       netgraph7/iface netgraph7/ksocket netgraph7/l2tp netgraph7/lmi \
+       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 \
        netproto/key netproto/natm netproto/ncp netproto/smb \
index 0a73ac6..73782ea 100644 (file)
@@ -83,8 +83,8 @@
 */
 #include <netgraph7/ksocket/ng_ksocket.h>
 #include <netgraph7/l2tp/ng_l2tp.h>
-/*
 #include <netgraph7/lmi/ng_lmi.h>
+/*
 #include <netgraph7/mppc/ng_mppc.h>
 #include <netgraph7/one2many/ng_one2many.h>
 #include <netgraph7/ppp/ng_ppp.h>
@@ -159,9 +159,9 @@ static const struct ng_cookie cookies[] = {
        COOKIE(IP_INPUT),
 */
        COOKIE(KSOCKET),
-/*
        COOKIE(L2TP),
        COOKIE(LMI),
+/*
        COOKIE(MPPC),
        COOKIE(ONE2MANY),
        COOKIE(PPP),
index 925b5d8..23e95a7 100644 (file)
@@ -1324,7 +1324,7 @@ netgraph7/ng_ip_input.c           optional netgraph7_ip_input
 netgraph7/ng_ipfw.c            optional netgraph7_ipfw
 netgraph7/ksocket/ng_ksocket.c optional netgraph7_ksocket
 netgraph7/l2tp/ng_l2tp.c       optional netgraph7_l2tp
-netgraph7/ng_lmi.c             optional netgraph7_lmi
+netgraph7/lmi/ng_lmi.c         optional netgraph7_lmi
 netgraph7/ng_mppc.c            optional netgraph7_mppc_compression
 netgraph7/ng_mppc.c            optional netgraph7_mppc_encryption
 netgraph7/ng_nat.c             optional netgraph7_nat
index b30e56a..e550ddb 100644 (file)
@@ -17,6 +17,7 @@ SUBDIR=       UI \
        iface \
        ksocket \
        l2tp \
+       lmi \
        netgraph \
        pptpgre \
        socket \
@@ -24,7 +25,6 @@ SUBDIR=       UI \
        vjc
 #      eiface \
 #      fec \
-#      lmi \
 #      netgraph \
 #      one2many \
 #      ppp \
diff --git a/sys/netgraph7/lmi/Makefile b/sys/netgraph7/lmi/Makefile
new file mode 100644 (file)
index 0000000..eaaa62b
--- /dev/null
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/lmi/Makefile,v 1.1.4.3 2001/12/21 09:00:49 ru Exp $
+# $DragonFly: src/sys/netgraph/lmi/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_lmi
+SRCS=          ng_lmi.c
+
+.include <bsd.kmod.mk>
similarity index 99%
rename from sys/netgraph7/ng_lmi.c
rename to sys/netgraph7/lmi/ng_lmi.c
index 91596a3..c8345c8 100644 (file)
@@ -61,8 +61,8 @@
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
-#include "ng_message.h"
-#include "netgraph.h"
+#include <netgraph7/ng_message.h>
+#include <netgraph7/netgraph.h>
 #include "ng_lmi.h"
 
 /*