Module Name: src Committed By: pooka Date: Sat Apr 26 11:23:03 UTC 2014
Modified Files: src/sys/rump/librump/rumpnet: net_stub.c src/sys/rump/net/lib/libsockin: sockin.c Log Message: Move a few stubs to where they really belong; allows us to create them as strong instead of weak symbols. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/rump/librump/rumpnet/net_stub.c cvs rdiff -u -r1.36 -r1.37 src/sys/rump/net/lib/libsockin/sockin.c 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/librump/rumpnet/net_stub.c diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.15 src/sys/rump/librump/rumpnet/net_stub.c:1.16 --- src/sys/rump/librump/rumpnet/net_stub.c:1.15 Sat Apr 26 11:17:55 2014 +++ src/sys/rump/librump/rumpnet/net_stub.c Sat Apr 26 11:23:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $ */ +/* $NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.15 2014/04/26 11:17:55 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: net_stub.c,v 1.16 2014/04/26 11:23:03 pooka Exp $"); #include <sys/param.h> #include <sys/protosw.h> @@ -46,10 +46,6 @@ __rumpnet_stub(void) panic("component not available"); } -__weak_alias(rtrequest,__rumpnet_stub); -__weak_alias(ifunit,__rumpnet_stub); -__weak_alias(ifreq_setaddr,__rumpnet_stub); - /* * Weak symbols so that we can optionally leave components out. * (would be better to fix sys/net* to be more modular, though) Index: src/sys/rump/net/lib/libsockin/sockin.c diff -u src/sys/rump/net/lib/libsockin/sockin.c:1.36 src/sys/rump/net/lib/libsockin/sockin.c:1.37 --- src/sys/rump/net/lib/libsockin/sockin.c:1.36 Thu Mar 13 01:40:30 2014 +++ src/sys/rump/net/lib/libsockin/sockin.c Sat Apr 26 11:23:03 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: sockin.c,v 1.36 2014/03/13 01:40:30 pooka Exp $ */ +/* $NetBSD: sockin.c,v 1.37 2014/04/26 11:23:03 pooka Exp $ */ /* * Copyright (c) 2008, 2009 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.36 2014/03/13 01:40:30 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sockin.c,v 1.37 2014/04/26 11:23:03 pooka Exp $"); #include <sys/param.h> #include <sys/condvar.h> @@ -560,3 +560,14 @@ sockin_ctloutput(int op, struct socket * return rumpcomp_sockin_setsockopt(SO2S(so), sopt->sopt_level, sopt->sopt_name, sopt->sopt_data, sopt->sopt_size); } + +int sockin_unavailable(void); +int +sockin_unavailable(void) +{ + + panic("interface not available in with sockin"); +} +__strong_alias(rtrequest,sockin_unavailable); +__strong_alias(ifunit,sockin_unavailable); +__strong_alias(ifreq_setaddr,sockin_unavailable);