Module Name: src Committed By: pooka Date: Mon Aug 24 22:25:50 UTC 2015
Modified Files: src/sys/rump/include/opt: opt_rumpkernel.h Removed Files: src/sys/rump/librump/rumpkern/opt: rnd.h src/sys/rump/librump/rumpnet/opt: opt_atalk.h opt_dccp.h opt_inet.h opt_inet6.h opt_mbuftrace.h opt_natm.h opt_pipe.h opt_route.h opt_sb_max.h opt_sock_counters.h opt_somaxkva.h opt_sosend_loan.h src/sys/rump/net/lib/libnet/opt: opt_mpls.h opt_net_mpsafe.h opt_pfil_hooks.h opt_pppoe.h opt_route.h src/sys/rump/net/lib/libnetinet/opt: opt_eon.h opt_gateway.h opt_inet_conf.h opt_inet_csum.h opt_ipsec.h opt_mrouting.h opt_pim.h opt_tcp_compat_42.h opt_tcp_congctl.h opt_tcp_debug.h opt_tcp_space.h opt_wlan.h rnd.h Log Message: Remove a bunch of opt files. It's a cute idea to have component-specific opt files, but also a completely stupid one since there's no way of knowing how options transcend component boundaries, and therefore if a set of options is conflicting or not. So, just continue concentrating all of opt_foo.h in opt_rumpkernel.h in accordance with the monolithic opt model. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/opt/opt_rumpkernel.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpkern/opt/rnd.h cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpnet/opt/opt_atalk.h \ src/sys/rump/librump/rumpnet/opt/opt_dccp.h \ src/sys/rump/librump/rumpnet/opt/opt_inet6.h \ src/sys/rump/librump/rumpnet/opt/opt_mbuftrace.h \ src/sys/rump/librump/rumpnet/opt/opt_natm.h \ src/sys/rump/librump/rumpnet/opt/opt_pipe.h \ src/sys/rump/librump/rumpnet/opt/opt_route.h \ src/sys/rump/librump/rumpnet/opt/opt_sb_max.h \ src/sys/rump/librump/rumpnet/opt/opt_sock_counters.h \ src/sys/rump/librump/rumpnet/opt/opt_somaxkva.h \ src/sys/rump/librump/rumpnet/opt/opt_sosend_loan.h cvs rdiff -u -r1.4 -r0 src/sys/rump/librump/rumpnet/opt/opt_inet.h cvs rdiff -u -r1.3 -r0 src/sys/rump/net/lib/libnet/opt/opt_mpls.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnet/opt/opt_net_mpsafe.h \ src/sys/rump/net/lib/libnet/opt/opt_pfil_hooks.h \ src/sys/rump/net/lib/libnet/opt/opt_pppoe.h \ src/sys/rump/net/lib/libnet/opt/opt_route.h cvs rdiff -u -r1.1 -r0 src/sys/rump/net/lib/libnetinet/opt/opt_eon.h \ src/sys/rump/net/lib/libnetinet/opt/opt_gateway.h \ src/sys/rump/net/lib/libnetinet/opt/opt_inet_conf.h \ src/sys/rump/net/lib/libnetinet/opt/opt_inet_csum.h \ src/sys/rump/net/lib/libnetinet/opt/opt_ipsec.h \ src/sys/rump/net/lib/libnetinet/opt/opt_mrouting.h \ src/sys/rump/net/lib/libnetinet/opt/opt_pim.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_compat_42.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_congctl.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_debug.h \ src/sys/rump/net/lib/libnetinet/opt/opt_tcp_space.h \ src/sys/rump/net/lib/libnetinet/opt/opt_wlan.h \ src/sys/rump/net/lib/libnetinet/opt/rnd.h 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/include/opt/opt_rumpkernel.h diff -u src/sys/rump/include/opt/opt_rumpkernel.h:1.1 src/sys/rump/include/opt/opt_rumpkernel.h:1.2 --- src/sys/rump/include/opt/opt_rumpkernel.h:1.1 Fri Aug 21 12:39:07 2015 +++ src/sys/rump/include/opt/opt_rumpkernel.h Mon Aug 24 22:25:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: opt_rumpkernel.h,v 1.1 2015/08/21 12:39:07 pooka Exp $ */ +/* $NetBSD: opt_rumpkernel.h,v 1.2 2015/08/24 22:25:50 pooka Exp $ */ #ifndef __NetBSD__ #define __NetBSD__ @@ -12,3 +12,14 @@ #define MAXUSERS 32 #define DEBUGPRINT + +#define INET 1 +#define INET6 1 +#define GATEWAY 1 + +#define MPLS 1 + +#define SOSEND_NO_LOAN + +#undef PIPE_SOCKETPAIR /* would need uipc_usrreq.c */ +#define PIPE_NODIRECT