[src/trunk]: src/sys/rump/net/lib/libnet Support bridging. As usual, it woul...

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

details:   https://anonhg.NetBSD.org/src/rev/c01353e7635e
branches:  trunk
changeset: 759376:c01353e7635e
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Dec 07 20:39:07 2010 +0000

description:
Support bridging.  As usual, it would be nice if this could be a
separate component, but King Ifdef doesn't let us.

diffstat:

 sys/rump/net/lib/libnet/Makefile     |  7 ++++---
 sys/rump/net/lib/libnet/component.c  |  7 +++++--
 sys/rump/net/lib/libnet/opt/bridge.h |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (65 lines):

diff -r 346562d20b77 -r c01353e7635e sys/rump/net/lib/libnet/Makefile
--- a/sys/rump/net/lib/libnet/Makefile  Tue Dec 07 20:38:26 2010 +0000
+++ b/sys/rump/net/lib/libnet/Makefile  Tue Dec 07 20:39:07 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/11/07 19:47:18 pooka Exp $
+#      $NetBSD: Makefile,v 1.9 2010/12/07 20:39:07 pooka Exp $
 #
 
 .PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
@@ -6,8 +6,9 @@
 LIB=   rumpnet_net
 
 # 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.c if_bridge.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+= bridgestp.c
 SRCS+= if_43.c uipc_syscalls_50.c
 SRCS+= component.c
 
diff -r 346562d20b77 -r c01353e7635e sys/rump/net/lib/libnet/component.c
--- a/sys/rump/net/lib/libnet/component.c       Tue Dec 07 20:38:26 2010 +0000
+++ b/sys/rump/net/lib/libnet/component.c       Tue Dec 07 20:39:07 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: component.c,v 1.5 2010/10/19 15:40:15 pooka Exp $      */
+/*     $NetBSD: component.c,v 1.6 2010/12/07 20:39:07 pooka Exp $      */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.5 2010/10/19 15:40:15 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.6 2010/12/07 20:39:07 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -40,6 +40,8 @@
 #include "rump_private.h"
 #include "rump_net_private.h"
 
+extern void bridgeattach(int);
+
 RUMP_COMPONENT(RUMP_COMPONENT_NET_ROUTE)
 {
        extern struct domain routedomain, linkdomain;
@@ -47,6 +49,7 @@
        ifinit1();
        ifinit();
        loopattach(1);
+       bridgeattach(1);
        DOMAINADD(linkdomain);
        DOMAINADD(routedomain);
 }
diff -r 346562d20b77 -r c01353e7635e sys/rump/net/lib/libnet/opt/bridge.h
--- a/sys/rump/net/lib/libnet/opt/bridge.h      Tue Dec 07 20:38:26 2010 +0000
+++ b/sys/rump/net/lib/libnet/opt/bridge.h      Tue Dec 07 20:39:07 2010 +0000
@@ -1,3 +1,3 @@
-/*     $NetBSD: bridge.h,v 1.1 2008/10/06 00:27:06 pooka Exp $ */
+/*     $NetBSD: bridge.h,v 1.2 2010/12/07 20:39:07 pooka Exp $ */
 
-/* dummy */
+#define NBRIDGE 1