Sun Jan 9 12:20:54 2011 UTC ()
Separate interface init and domain adding.


(pooka)
diff -r1.7 -r1.8 src/sys/rump/net/lib/libnet/component.c
cvs diff -r1.7 -r1.8 src/sys/rump/net/lib/libnet/Attic/component.c (expand / switch to unified diff)

--- src/sys/rump/net/lib/libnet/Attic/component.c 2010/12/08 18:06:43 1.7
+++ src/sys/rump/net/lib/libnet/Attic/component.c 2011/01/09 12:20:53 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: component.c,v 1.7 2010/12/08 18:06:43 pooka Exp $ */ 1/* $NetBSD: component.c,v 1.8 2011/01/09 12:20:53 pooka Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2009 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Development of this software was supported by The Nokia Foundation 6 * Development of this software was supported by The Nokia Foundation
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -18,37 +18,40 @@ @@ -18,37 +18,40 @@
18 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 18 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 20 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30#include <sys/cdefs.h> 30#include <sys/cdefs.h>
31__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.7 2010/12/08 18:06:43 pooka Exp $"); 31__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.8 2011/01/09 12:20:53 pooka Exp $");
32 32
33#include <sys/param.h> 33#include <sys/param.h>
34#include <sys/domain.h> 34#include <sys/domain.h>
35#include <sys/protosw.h> 35#include <sys/protosw.h>
36 36
37#include <net/if.h> 37#include <net/if.h>
38#include <net/route.h> 38#include <net/route.h>
39 39
40#include "rump_private.h" 40#include "rump_private.h"
41#include "rump_net_private.h" 41#include "rump_net_private.h"
42 42
43extern void bridgeattach(int); 43RUMP_COMPONENT(RUMP_COMPONENT_NET)
44 
45RUMP_COMPONENT(RUMP_COMPONENT_NET_ROUTE) 
46{ 44{
47 extern struct domain routedomain, linkdomain; 
48 45
49 ifinit1(); 46 ifinit1();
50 ifinit(); 47 ifinit();
51 loopattach(1); 48 loopattach(1);
 49}
 50
 51RUMP_COMPONENT(RUMP_COMPONENT_NET_ROUTE)
 52{
 53 extern struct domain routedomain, linkdomain;
 54
52 DOMAINADD(linkdomain); 55 DOMAINADD(linkdomain);
53 DOMAINADD(routedomain); 56 DOMAINADD(routedomain);
54} 57}