diff --git a/sys/rump/net/lib/libagr/AGR.ioconf b/sys/rump/net/lib/libagr/AGR.ioconf new file mode 100644 index 000000000000..98ae3fc09cfe --- /dev/null +++ b/sys/rump/net/lib/libagr/AGR.ioconf @@ -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 diff --git a/sys/rump/net/lib/libagr/Makefile b/sys/rump/net/lib/libagr/Makefile index eda9b14f6547..b40e2f48b31b 100644 --- a/sys/rump/net/lib/libagr/Makefile +++ b/sys/rump/net/lib/libagr/Makefile @@ -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 \ diff --git a/sys/rump/net/lib/libbridge/BRIDGE.ioconf b/sys/rump/net/lib/libbridge/BRIDGE.ioconf new file mode 100644 index 000000000000..3cadd04ce538 --- /dev/null +++ b/sys/rump/net/lib/libbridge/BRIDGE.ioconf @@ -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 diff --git a/sys/rump/net/lib/libbridge/Makefile b/sys/rump/net/lib/libbridge/Makefile index 3d3fe3d4902b..1c29bf95c024 100644 --- a/sys/rump/net/lib/libbridge/Makefile +++ b/sys/rump/net/lib/libbridge/Makefile @@ -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 diff --git a/sys/rump/net/lib/libnet/Makefile b/sys/rump/net/lib/libnet/Makefile index 6419c400cfbd..0d10f7a009c2 100644 --- a/sys/rump/net/lib/libnet/Makefile +++ b/sys/rump/net/lib/libnet/Makefile @@ -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 .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 + .if !empty(RUMP_NBCOMPAT:M50) SRCS+= rtsock_50.c uipc_syscalls_50.c .endif diff --git a/sys/rump/net/lib/libnet/NET.ioconf b/sys/rump/net/lib/libnet/NET.ioconf new file mode 100644 index 000000000000..accda13e3b6c --- /dev/null +++ b/sys/rump/net/lib/libnet/NET.ioconf @@ -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 diff --git a/sys/rump/net/lib/libnetmpls/Makefile b/sys/rump/net/lib/libnetmpls/Makefile index 86b74d5aaebd..9377fa7780e4 100644 --- a/sys/rump/net/lib/libnetmpls/Makefile +++ b/sys/rump/net/lib/libnetmpls/Makefile @@ -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 diff --git a/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf b/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf new file mode 100644 index 000000000000..3bb1525f2284 --- /dev/null +++ b/sys/rump/net/lib/libnetmpls/NETMPLS.ioconf @@ -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 diff --git a/sys/rump/net/lib/libnetmpls/netmpls_component.c b/sys/rump/net/lib/libnetmpls/netmpls_component.c index ba89e1d263c3..dafc6617c756 100644 --- a/sys/rump/net/lib/libnetmpls/netmpls_component.c +++ b/sys/rump/net/lib/libnetmpls/netmpls_component.c @@ -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 -__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 #include @@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: netmpls_component.c,v 1.2 2014/08/22 11:34:28 pooka #include "rump_private.h" #include "rump_net_private.h" -void ifmplsattach(int); +#include "ioconf.h" RUMP_COMPONENT(RUMP_COMPONENT_NET) { diff --git a/sys/rump/net/lib/libnpf/Makefile b/sys/rump/net/lib/libnpf/Makefile index a654f47085e3..8d2c87f04f62 100644 --- a/sys/rump/net/lib/libnpf/Makefile +++ b/sys/rump/net/lib/libnpf/Makefile @@ -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 diff --git a/sys/rump/net/lib/libnpf/NPF.ioconf b/sys/rump/net/lib/libnpf/NPF.ioconf new file mode 100644 index 000000000000..18fe533e43d5 --- /dev/null +++ b/sys/rump/net/lib/libnpf/NPF.ioconf @@ -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 diff --git a/sys/rump/net/lib/libtap/Makefile b/sys/rump/net/lib/libtap/Makefile index c4754774502e..d18a7e8458ad 100644 --- a/sys/rump/net/lib/libtap/Makefile +++ b/sys/rump/net/lib/libtap/Makefile @@ -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 diff --git a/sys/rump/net/lib/libtap/TAP.ioconf b/sys/rump/net/lib/libtap/TAP.ioconf new file mode 100644 index 000000000000..9e5a936b3fae --- /dev/null +++ b/sys/rump/net/lib/libtap/TAP.ioconf @@ -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 diff --git a/sys/rump/net/lib/libtap/tap_component.c b/sys/rump/net/lib/libtap/tap_component.c index 6d9a1f56af3d..79bcd8856b07 100644 --- a/sys/rump/net/lib/libtap/tap_component.c +++ b/sys/rump/net/lib/libtap/tap_component.c @@ -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 -__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 #include @@ -36,9 +36,9 @@ __KERNEL_RCSID(0, "$NetBSD: tap_component.c,v 1.1 2015/05/29 12:32:23 pooka Exp #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) {