PERFORCE change 154309 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=154309

Change 154309 by zec at zec_tpx32 on 2008/12/08 02:22:49

	Nuke ng_wormhole to reduce the confusion among more essential
	changes requiring attention and thought in the vimage branch.
	
	ng_wormhole allowed for netgraph topologies to span multiple
	vnets / vimages, which is a neat functionality, though not
	so badly needed by probably 99% of people waiting for vimage
	to arrive in -CURRENT.  Moreover, ng_wormhole was effectively
	defunct ever since the introduction of hierarchichal vimage
	naming scheme.  We'll most probably bring it back to life
	once the management interface for vimage infrastructure gets
	settled.  Until that time, ng_wormhole will continue to live
	under the radar in zec_vimage_7 branch in p4...

Affected files ...

.. //depot/projects/vimage/src/sys/conf/files#47 edit
.. //depot/projects/vimage/src/sys/conf/options#38 edit
.. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#8 edit
.. //depot/projects/vimage/src/sys/modules/netgraph/wormhole/Makefile#2 delete
.. //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#7 delete
.. //depot/projects/vimage/src/sys/sys/vimage.h#71 edit

Differences ...

==== //depot/projects/vimage/src/sys/conf/files#47 (text+ko) ====

@@ -2314,7 +2314,6 @@
 netgraph/ng_tee.c		optional netgraph_tee
 netgraph/ng_tty.c		optional netgraph_tty
 netgraph/ng_vjc.c		optional netgraph_vjc
-netgraph/ng_wormhole.c		optional netgraph_wormhole vimage
 netinet/accf_data.c		optional accept_filter_data
 netinet/accf_dns.c		optional accept_filter_dns
 netinet/accf_http.c		optional accept_filter_http

==== //depot/projects/vimage/src/sys/conf/options#38 (text+ko) ====

@@ -491,7 +491,6 @@
 NETGRAPH_TTY		opt_netgraph.h
 NETGRAPH_UI		opt_netgraph.h
 NETGRAPH_VJC		opt_netgraph.h
-NETGRAPH_WORMHOLE	opt_netgraph.h
 
 # NgATM options
 NGATM_ATM		opt_netgraph.h

==== //depot/projects/vimage/src/sys/modules/netgraph/Makefile#8 (text+ko) ====

@@ -51,8 +51,7 @@
 	tee \
 	UI \
 	vjc \
-	vlan \
-	${_wormhole}
+	vlan
 
 .if ${MACHINE_ARCH} == "i386"
 _sync_ar=	sync_ar
@@ -67,9 +66,4 @@
 _mppc=		mppc
 .endif
 
-VIMAGE!=        grep VIMAGE ${KERNBUILDDIR}/opt_vimage.h | cut -d" " -f3 || true
-.if ${VIMAGE} == 1
-_wormhole=	wormhole
-.endif
-
 .include <bsd.subdir.mk>

==== //depot/projects/vimage/src/sys/sys/vimage.h#71 (text+ko) ====

@@ -82,7 +82,6 @@
 #define VNET_MOD_ATALK		10
 #define VNET_MOD_ACCF_HTTP	11
 /* stateless modules */
-#define VNET_MOD_NG_WORMHOLE	19
 #define VNET_MOD_NG_ETHER	20
 #define VNET_MOD_NG_IFACE	21
 #define VNET_MOD_NG_EIFACE	22