Module Name: src
Committed By: christos
Date: Thu Aug 20 12:20:10 UTC 2015
Modified Files:
src/sys/rump/net/lib/libagr: Makefile
src/sys/rump/net/lib/libbridge: Makefile
src/sys/rump/net/lib/libnet: Makefile
src/sys/rump/net/lib/libnetmpls: Makefile netmpls_component.c
src/sys/rump/net/lib/libnpf: Makefile
src/sys/rump/net/lib/libtap: Makefile tap_component.c
Added Files:
src/sys/rump/net/lib/libagr: AGR.ioconf
src/sys/rump/net/lib/libbridge: BRIDGE.ioconf
src/sys/rump/net/lib/libnet: NET.ioconf
src/sys/rump/net/lib/libnetmpls: NETMPLS.ioconf
src/sys/rump/net/lib/libnpf: NPF.ioconf
src/sys/rump/net/lib/libtap: TAP.ioconf
Log Message:
add ioconf files for pseudo device attach prototypes
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libagr/AGR.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libagr/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libbridge/BRIDGE.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libbridge/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnet/NET.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/lib/libnetmpls/Makefile \
src/sys/rump/net/lib/libnetmpls/netmpls_component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/net/lib/libnpf/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libnpf/NPF.ioconf
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libtap/Makefile \
src/sys/rump/net/lib/libtap/tap_component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libtap/TAP.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libagr/Makefile
diff -u src/sys/rump/net/lib/libagr/Makefile:1.2 src/sys/rump/net/lib/libagr/Makefile:1.3
--- src/sys/rump/net/lib/libagr/Makefile:1.2 Wed Mar 12 22:07:03 2014
+++ src/sys/rump/net/lib/libagr/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:07:03 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net/agr
LIB= rumpnet_agr
-
+IOCONF= AGR.ioconf
SRCS= if_agr.c if_agrsoftc.c if_agrsubr.c if_agrtimer.c if_agrmonitor.c \
if_agrether.c if_agrether_hash.c ieee8023ad_marker.c ieee8023ad_lacp.c \
ieee8023ad_lacp_select.c ieee8023ad_lacp_timer.c \
Index: src/sys/rump/net/lib/libbridge/Makefile
diff -u src/sys/rump/net/lib/libbridge/Makefile:1.2 src/sys/rump/net/lib/libbridge/Makefile:1.3
--- src/sys/rump/net/lib/libbridge/Makefile:1.2 Wed Mar 12 22:08:24 2014
+++ src/sys/rump/net/lib/libbridge/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:08:24 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net
LIB= rumpnet_bridge
-
+IOCONF= BRIDGE.ioconf
SRCS= if_bridge.c bridgestp.c
SRCS+= bridge_component.c
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.23 src/sys/rump/net/lib/libnet/Makefile:1.24
--- src/sys/rump/net/lib/libnet/Makefile:1.23 Thu Apr 23 10:49:26 2015
+++ src/sys/rump/net/lib/libnet/Makefile Thu Aug 20 08:20:09 2015
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.23 2015/04/23 14:49:26 pooka Exp $
+# $NetBSD: Makefile,v 1.24 2015/08/20 12:20:09 christos Exp $
#
-.include <bsd.init.mk>
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
LIB= rumpnet_net
-
+IOCONF= NET.ioconf
# iffy stuff
SRCS= if.c if_loop.c route.c rtsock.c raw_usrreq.c \
raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c
SRCS+= if_43.c pfil.c
SRCS+= net_component.c
+.include <bsd.init.mk>
+
.if !empty(RUMP_NBCOMPAT:M50)
SRCS+= rtsock_50.c uipc_syscalls_50.c
.endif
Index: src/sys/rump/net/lib/libnetmpls/Makefile
diff -u src/sys/rump/net/lib/libnetmpls/Makefile:1.2 src/sys/rump/net/lib/libnetmpls/Makefile:1.3
--- src/sys/rump/net/lib/libnetmpls/Makefile:1.2 Wed Mar 12 22:05:29 2014
+++ src/sys/rump/net/lib/libnetmpls/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/03/13 02:05:29 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../netmpls
LIB= rumpnet_netmpls
-
+IOCONF= NETMPLS.ioconf
SRCS= mpls_ttl.c if_mpls.c
SRCS+= netmpls_component.c
Index: src/sys/rump/net/lib/libnetmpls/netmpls_component.c
diff -u src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.2 src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.3
--- src/sys/rump/net/lib/libnetmpls/netmpls_component.c:1.2 Fri Aug 22 07:34:28 2014
+++ src/sys/rump/net/lib/libnetmpls/netmpls_component.c Thu Aug 20 08:20:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $ */
+/* $NetBSD: netmpls_component.c,v 1.3 2015/08/20 12:20:09 christos Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.3 2015/08/20 12:20:09 christos Exp $");
#include <sys/param.h>
#include <sys/domain.h>
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: netmpls_comp
#include "rump_private.h"
#include "rump_net_private.h"
-void ifmplsattach(int);
+#include "ioconf.h"
RUMP_COMPONENT(RUMP_COMPONENT_NET)
{
Index: src/sys/rump/net/lib/libnpf/Makefile
diff -u src/sys/rump/net/lib/libnpf/Makefile:1.14 src/sys/rump/net/lib/libnpf/Makefile:1.15
--- src/sys/rump/net/lib/libnpf/Makefile:1.14 Sat Jul 19 14:24:16 2014
+++ src/sys/rump/net/lib/libnpf/Makefile Thu Aug 20 08:20:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/07/19 18:24:16 rmind Exp $
+# $NetBSD: Makefile,v 1.15 2015/08/20 12:20:09 christos Exp $
#
# Public Domain.
#
@@ -8,7 +8,7 @@ NOLINT= # defined
.PATH: ${.CURDIR}/../../../../net/npf
LIB= rumpnet_npf
-
+IOCONF= NPF.ioconf
SRCS= npf.c npf_alg.c npf_conf.c npf_ctl.c npf_handler.c
SRCS+= npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c
SRCS+= npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c
Index: src/sys/rump/net/lib/libtap/Makefile
diff -u src/sys/rump/net/lib/libtap/Makefile:1.1 src/sys/rump/net/lib/libtap/Makefile:1.2
--- src/sys/rump/net/lib/libtap/Makefile:1.1 Fri May 29 08:32:23 2015
+++ src/sys/rump/net/lib/libtap/Makefile Thu Aug 20 08:20:09 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2015/05/29 12:32:23 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2015/08/20 12:20:09 christos Exp $
#
.PATH: ${.CURDIR}/../../../../net
LIB= rumpnet_tap
-
+IOCONF= TAP.ioconf
SRCS= if_tap.c
SRCS+= tap_component.c
Index: src/sys/rump/net/lib/libtap/tap_component.c
diff -u src/sys/rump/net/lib/libtap/tap_component.c:1.1 src/sys/rump/net/lib/libtap/tap_component.c:1.2
--- src/sys/rump/net/lib/libtap/tap_component.c:1.1 Fri May 29 08:32:23 2015
+++ src/sys/rump/net/lib/libtap/tap_component.c Thu Aug 20 08:20:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tap_component.c,v 1.1 2015/05/29 12:32:23 pooka Exp $ */
+/* $NetBSD: tap_component.c,v 1.2 2015/08/20 12:20:09 christos Exp $ */
/*
* Copyright (c) 2015 Wei Liu. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tap_component.c,v 1.1 2015/05/29 12:32:23 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tap_component.c,v 1.2 2015/08/20 12:20:09 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -36,9 +36,9 @@ __KERNEL_RCSID(0, "$NetBSD: tap_componen
#include "rump_net_private.h"
#include "rump_vfs_private.h"
-CFDRIVER_DECL(tap, DV_IFNET, NULL);
+#include "ioconf.h"
-void tapattach(int);
+CFDRIVER_DECL(tap, DV_IFNET, NULL);
RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
{
Added files:
Index: src/sys/rump/net/lib/libagr/AGR.ioconf
diff -u /dev/null src/sys/rump/net/lib/libagr/AGR.ioconf:1.1
--- /dev/null Thu Aug 20 08:20:10 2015
+++ src/sys/rump/net/lib/libagr/AGR.ioconf Thu Aug 20 08:20:09 2015
@@ -0,0 +1,7 @@
+# $NetBSD: AGR.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+
+ioconf agr
+
+include "conf/files"
+
+pseudo-device agr
Index: src/sys/rump/net/lib/libbridge/BRIDGE.ioconf
diff -u /dev/null src/sys/rump/net/lib/libbridge/BRIDGE.ioconf:1.1
--- /dev/null Thu Aug 20 08:20:10 2015
+++ src/sys/rump/net/lib/libbridge/BRIDGE.ioconf Thu Aug 20 08:20:09 2015
@@ -0,0 +1,7 @@
+# $NetBSD: BRIDGE.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+
+ioconf bridge
+
+include "conf/files"
+
+pseudo-device bridge
Index: src/sys/rump/net/lib/libnet/NET.ioconf
diff -u /dev/null src/sys/rump/net/lib/libnet/NET.ioconf:1.1
--- /dev/null Thu Aug 20 08:20:10 2015
+++ src/sys/rump/net/lib/libnet/NET.ioconf Thu Aug 20 08:20:09 2015
@@ -0,0 +1,7 @@
+# $NetBSD: NET.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+
+ioconf net
+
+include "conf/files"
+
+pseudo-device carp
Index: src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf
diff -u /dev/null src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf:1.1
--- /dev/null Thu Aug 20 08:20:10 2015
+++ src/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf Thu Aug 20 08:20:09 2015
@@ -0,0 +1,7 @@
+# $NetBSD: NETMPLS.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+
+ioconf netmpls
+
+include "conf/files"
+
+pseudo-device ifmpls
Index: src/sys/rump/net/lib/libnpf/NPF.ioconf
diff -u /dev/null src/sys/rump/net/lib/libnpf/NPF.ioconf:1.1
--- /dev/null Thu Aug 20 08:20:10 2015
+++ src/sys/rump/net/lib/libnpf/NPF.ioconf Thu Aug 20 08:20:09 2015
@@ -0,0 +1,7 @@
+# $NetBSD: NPF.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+
+ioconf npf
+
+include "conf/files"
+
+pseudo-device npf
Index: src/sys/rump/net/lib/libtap/TAP.ioconf
diff -u /dev/null src/sys/rump/net/lib/libtap/TAP.ioconf:1.1
--- /dev/null Thu Aug 20 08:20:10 2015
+++ src/sys/rump/net/lib/libtap/TAP.ioconf Thu Aug 20 08:20:09 2015
@@ -0,0 +1,7 @@
+# $NetBSD: TAP.ioconf,v 1.1 2015/08/20 12:20:09 christos Exp $
+
+ioconf tap
+
+include "conf/files"
+
+pseudo-device tap
