[src/trunk]: src/sys/rump Remove a bunch of opt files.

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/576dd1e468ea
branches:  trunk
changeset: 340151:576dd1e468ea
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Aug 24 22:25:50 2015 +0000

description:
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.

diffstat:

 sys/rump/include/opt/opt_rumpkernel.h               |  13 ++++++++++++-
 sys/rump/librump/rumpkern/opt/rnd.h                 |   2 --
 sys/rump/librump/rumpnet/opt/opt_atalk.h            |   1 -
 sys/rump/librump/rumpnet/opt/opt_dccp.h             |   1 -
 sys/rump/librump/rumpnet/opt/opt_inet.h             |   4 ----
 sys/rump/librump/rumpnet/opt/opt_inet6.h            |   1 -
 sys/rump/librump/rumpnet/opt/opt_mbuftrace.h        |   1 -
 sys/rump/librump/rumpnet/opt/opt_natm.h             |   1 -
 sys/rump/librump/rumpnet/opt/opt_pipe.h             |   4 ----
 sys/rump/librump/rumpnet/opt/opt_route.h            |   3 ---
 sys/rump/librump/rumpnet/opt/opt_sb_max.h           |   1 -
 sys/rump/librump/rumpnet/opt/opt_sock_counters.h    |   1 -
 sys/rump/librump/rumpnet/opt/opt_somaxkva.h         |   1 -
 sys/rump/librump/rumpnet/opt/opt_sosend_loan.h      |   3 ---
 sys/rump/net/lib/libnet/opt/opt_mpls.h              |   3 ---
 sys/rump/net/lib/libnet/opt/opt_net_mpsafe.h        |   3 ---
 sys/rump/net/lib/libnet/opt/opt_pfil_hooks.h        |   3 ---
 sys/rump/net/lib/libnet/opt/opt_pppoe.h             |   3 ---
 sys/rump/net/lib/libnet/opt/opt_route.h             |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_eon.h           |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_gateway.h       |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_inet_conf.h     |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_inet_csum.h     |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_ipsec.h         |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_mrouting.h      |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_pim.h           |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_tcp_compat_42.h |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_tcp_congctl.h   |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_tcp_debug.h     |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_tcp_space.h     |   3 ---
 sys/rump/net/lib/libnetinet/opt/opt_wlan.h          |   3 ---
 sys/rump/net/lib/libnetinet/opt/rnd.h               |   3 ---
 32 files changed, 12 insertions(+), 79 deletions(-)

diffs (226 lines):

diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/include/opt/opt_rumpkernel.h
--- a/sys/rump/include/opt/opt_rumpkernel.h     Mon Aug 24 22:21:26 2015 +0000
+++ b/sys/rump/include/opt/opt_rumpkernel.h     Mon Aug 24 22:25:50 2015 +0000
@@ -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
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpkern/opt/rnd.h
--- a/sys/rump/librump/rumpkern/opt/rnd.h       Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-/*     $NetBSD: rnd.h,v 1.1 2009/01/04 20:30:21 pooka Exp $    */
-#define NRND 0 /* XXXbad */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_atalk.h
--- a/sys/rump/librump/rumpnet/opt/opt_atalk.h  Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_atalk.h,v 1.1 2008/10/15 13:00:40 pooka Exp $      */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_dccp.h
--- a/sys/rump/librump/rumpnet/opt/opt_dccp.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_dccp.h,v 1.1 2015/02/10 19:11:52 rjs Exp $ */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_inet.h
--- a/sys/rump/librump/rumpnet/opt/opt_inet.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/*     $NetBSD: opt_inet.h,v 1.4 2015/01/18 17:33:08 justin Exp $      */
-
-#define INET  1
-#define INET6 1
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_inet6.h
--- a/sys/rump/librump/rumpnet/opt/opt_inet6.h  Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_inet6.h,v 1.1 2009/05/26 23:43:39 pooka Exp $      */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_mbuftrace.h
--- a/sys/rump/librump/rumpnet/opt/opt_mbuftrace.h      Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_mbuftrace.h,v 1.1 2008/10/15 13:00:40 pooka Exp $  */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_natm.h
--- a/sys/rump/librump/rumpnet/opt/opt_natm.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_natm.h,v 1.1 2008/10/15 13:00:40 pooka Exp $       */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_pipe.h
--- a/sys/rump/librump/rumpnet/opt/opt_pipe.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/*     $NetBSD: opt_pipe.h,v 1.1 2008/10/15 13:00:40 pooka Exp $       */
-
-#undef PIPE_SOCKETPAIR /* would need uipc_usrreq.c */
-#define PIPE_NODIRECT
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_route.h
--- a/sys/rump/librump/rumpnet/opt/opt_route.h  Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_route.h,v 1.1 2011/03/31 19:40:53 dyoung Exp $     */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_sb_max.h
--- a/sys/rump/librump/rumpnet/opt/opt_sb_max.h Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_sb_max.h,v 1.1 2008/10/15 13:00:40 pooka Exp $     */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_sock_counters.h
--- a/sys/rump/librump/rumpnet/opt/opt_sock_counters.h  Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_sock_counters.h,v 1.1 2008/10/15 13:00:40 pooka Exp $      */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_somaxkva.h
--- a/sys/rump/librump/rumpnet/opt/opt_somaxkva.h       Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/*     $NetBSD: opt_somaxkva.h,v 1.1 2008/10/15 13:00:40 pooka Exp $   */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/librump/rumpnet/opt/opt_sosend_loan.h
--- a/sys/rump/librump/rumpnet/opt/opt_sosend_loan.h    Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_sosend_loan.h,v 1.1 2008/10/15 13:00:40 pooka Exp $        */
-
-#define SOSEND_NO_LOAN
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnet/opt/opt_mpls.h
--- a/sys/rump/net/lib/libnet/opt/opt_mpls.h    Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/* $NetBSD: opt_mpls.h,v 1.3 2014/03/18 18:20:44 riastradh Exp $ */
-
-#define        MPLS 1
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnet/opt/opt_net_mpsafe.h
--- a/sys/rump/net/lib/libnet/opt/opt_net_mpsafe.h      Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_net_mpsafe.h,v 1.1 2015/04/03 07:56:54 ozaki-r Exp $       */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnet/opt/opt_pfil_hooks.h
--- a/sys/rump/net/lib/libnet/opt/opt_pfil_hooks.h      Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_pfil_hooks.h,v 1.1 2008/10/06 00:27:07 pooka Exp $ */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnet/opt/opt_pppoe.h
--- a/sys/rump/net/lib/libnet/opt/opt_pppoe.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_pppoe.h,v 1.1 2008/10/06 00:27:07 pooka Exp $      */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnet/opt/opt_route.h
--- a/sys/rump/net/lib/libnet/opt/opt_route.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_route.h,v 1.1 2008/10/06 00:27:07 pooka Exp $      */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_eon.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_eon.h Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_eon.h,v 1.1 2008/10/06 00:27:48 pooka Exp $        */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_gateway.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_gateway.h     Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_gateway.h,v 1.1 2009/02/03 00:33:48 pooka Exp $    */
-
-#define GATEWAY
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_inet_conf.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_inet_conf.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_inet_conf.h,v 1.1 2008/10/06 00:27:48 pooka Exp $  */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_inet_csum.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_inet_csum.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_inet_csum.h,v 1.1 2008/10/06 00:27:49 pooka Exp $  */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_ipsec.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_ipsec.h       Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_ipsec.h,v 1.1 2008/10/06 00:27:49 pooka Exp $      */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_mrouting.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_mrouting.h    Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_mrouting.h,v 1.1 2008/10/06 00:27:49 pooka Exp $   */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_pim.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_pim.h Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_pim.h,v 1.1 2008/10/06 00:27:49 pooka Exp $        */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_tcp_compat_42.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_tcp_compat_42.h       Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_tcp_compat_42.h,v 1.1 2008/10/06 00:27:49 pooka Exp $      */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_tcp_congctl.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_tcp_congctl.h Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_tcp_congctl.h,v 1.1 2008/10/06 00:27:49 pooka Exp $        */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_tcp_debug.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_tcp_debug.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_tcp_debug.h,v 1.1 2008/10/06 00:27:49 pooka Exp $  */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_tcp_space.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_tcp_space.h   Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_tcp_space.h,v 1.1 2008/10/06 00:27:49 pooka Exp $  */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/opt_wlan.h
--- a/sys/rump/net/lib/libnetinet/opt/opt_wlan.h        Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: opt_wlan.h,v 1.1 2014/07/30 13:32:09 ozaki-r Exp $     */
-
-/* dummy */
diff -r 4875d9ac2948 -r 576dd1e468ea sys/rump/net/lib/libnetinet/opt/rnd.h
--- a/sys/rump/net/lib/libnetinet/opt/rnd.h     Mon Aug 24 22:21:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: rnd.h,v 1.1 2008/10/06 00:27:49 pooka Exp $    */
-
-/* dummy */