Welcome ng_bridge.
authorNuno Antunes <nuno.antunes@gmail.com>
Tue, 23 Jun 2009 17:12:50 +0000 (18:12 +0100)
committerNuno Antunes <nuno.antunes@gmail.com>
Tue, 10 Jan 2012 14:10:26 +0000 (14:10 +0000)
And also add netgraph7 include files to the Makefile. These somehow
were omited in the previous commit.

etc/mtree/BSD.include.dist
include/Makefile
sys/conf/files
sys/netgraph7/Makefile
sys/netgraph7/bridge/Makefile [new file with mode: 0644]
sys/netgraph7/bridge/ng_bridge.c [moved from sys/netgraph7/ng_bridge.c with 99% similarity]
sys/netgraph7/bridge/ng_bridge.h [moved from sys/netgraph7/ng_bridge.h with 100% similarity]

index d98c9d3..966df02 100644 (file)
         ..
         bpf
         ..
+        bridge
+        ..
         cisco
         ..
         ether
index 6f2f51f..0278356 100644 (file)
@@ -67,6 +67,11 @@ LSUBDIRS=    bus/cam bus/cam/scsi \
        netgraph/mppc netgraph/one2many netgraph/ppp \
        netgraph/pppoe netgraph/pptpgre netgraph/rfc1490 netgraph/socket \
        netgraph/tee netgraph/tty netgraph/vjc \
+       netgraph7/UI netgraph7/async netgraph7/atmllc netgraph7/bpf \
+       netgraph7/bridge netgraph7/cisco \
+       netgraph7/ether \
+       netgraph7/hole \
+       netgraph7/iface 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 80bc082..0af29e3 100644 (file)
@@ -1305,7 +1305,7 @@ netgraph7/async/ng_async.c        optional netgraph7_async
 netgraph7/atmllc/ng_atmllc.c   optional netgraph7_atmllc
 netgraph7/netgraph/ng_base.c   optional netgraph7
 netgraph7/bpf/ng_bpf.c         optional netgraph7_bpf
-netgraph7/ng_bridge.c          optional netgraph7_bridge
+netgraph7/bridge/ng_bridge.c   optional netgraph7_bridge
 netgraph7/ng_car.c             optional netgraph7_car
 netgraph7/cisco/ng_cisco.c     optional netgraph7_cisco
 netgraph7/ng_deflate.c         optional netgraph7_deflate
index 0a6351e..443e55c 100644 (file)
@@ -6,6 +6,7 @@ SUBDIR= UI \
        async \
        atmllc \
        bpf \
+       bridge \
        cisco \
        ether \
        hole \
@@ -14,7 +15,6 @@ SUBDIR=       UI \
        socket \
        tee \
        vjc
-#      bridge \
 #      echo \
 #      eiface \
 #      etf \
diff --git a/sys/netgraph7/bridge/Makefile b/sys/netgraph7/bridge/Makefile
new file mode 100644 (file)
index 0000000..59c7329
--- /dev/null
@@ -0,0 +1,8 @@
+# $FreeBSD: src/sys/modules/netgraph/bridge/Makefile,v 1.1.2.1 2000/09/13 04:23:38 archie Exp $
+# $DragonFly: src/sys/netgraph/bridge/Makefile,v 1.2 2003/06/17 04:28:45 dillon Exp $
+
+KMOD=          ng_bridge
+SRCS=          ng_bridge.c
+KMODDEPS=      netgraph
+
+.include <bsd.kmod.mk>
similarity index 99%
rename from sys/netgraph7/ng_bridge.c
rename to sys/netgraph7/bridge/ng_bridge.c
index 140eb79..9525fda 100644 (file)
 #include <net/ethernet.h>
 
 #include <netinet/in.h>
-#include <netinet/ip_fw.h>
+#include <net/ipfw/ip_fw.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_bridge.h"
 
 #ifdef NG_SEPARATE_MALLOC