Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Fix build for MPLS import: add options MPLS, changed pse...
details: https://anonhg.NetBSD.org/src/rev/e6b25222ed89
branches: trunk
changeset: 755888:e6b25222ed89
user: kefren <kefren%NetBSD.org@localhost>
date: Sat Jun 26 15:17:56 2010 +0000
description:
Fix build for MPLS import: add options MPLS, changed pseudo-device mpls
to pseudo-device ifmpls
diffstat:
sys/arch/i386/conf/ALL | 7 ++++---
sys/arch/i386/conf/GENERIC | 7 ++++---
sys/conf/files | 9 ++++-----
sys/net/if_mpls.c | 8 ++++----
sys/netmpls/files.netmpls | 6 ++++++
5 files changed, 22 insertions(+), 15 deletions(-)
diffs (153 lines):
diff -r 6632105c0aec -r e6b25222ed89 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Sat Jun 26 14:50:14 2010 +0000
+++ b/sys/arch/i386/conf/ALL Sat Jun 26 15:17:56 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.259 2010/06/26 14:36:48 kefren Exp $
+# $NetBSD: ALL,v 1.260 2010/06/26 15:17:56 kefren Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.259 $"
+#ident "ALL-$Revision: 1.260 $"
maxusers 64 # estimated number of users
@@ -218,6 +218,7 @@
options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
+options MPLS # MultiProtocol Label Switching (needs ifmpls)
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options ISO,TPIP # OSI
@@ -1593,7 +1594,7 @@
pseudo-device bpfilter # Berkeley packet filter
pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
-pseudo-device mpls # MultiProtocol Label Switching
+pseudo-device ifmpls # MPLS pseudo-interface
pseudo-device loop # network loopback
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
diff -r 6632105c0aec -r e6b25222ed89 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sat Jun 26 14:50:14 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC Sat Jun 26 15:17:56 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.985 2010/06/26 14:36:48 kefren Exp $
+# $NetBSD: GENERIC,v 1.986 2010/06/26 15:17:56 kefren Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.985 $"
+#ident "GENERIC-$Revision: 1.986 $"
maxusers 64 # estimated number of users
@@ -213,6 +213,7 @@
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_NAT_T # IPsec NAT traversal (NAT-T)
#options IPSEC_DEBUG # debug for IP security
+#options MPLS # MultiProtocol Label Switching (needs ifmpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
#options ISO,TPIP # OSI
@@ -1536,7 +1537,7 @@
#pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device mpls # MultiProtocol Label Switching
+#pseudo-device ifmpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
#options PPPOE_SERVER # Enable PPPoE server via link0
diff -r 6632105c0aec -r e6b25222ed89 sys/conf/files
--- a/sys/conf/files Sat Jun 26 14:50:14 2010 +0000
+++ b/sys/conf/files Sat Jun 26 15:17:56 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.990 2010/06/26 14:24:27 kefren Exp $
+# $NetBSD: files,v 1.991 2010/06/26 15:17:56 kefren Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -193,6 +193,7 @@
include "netinet6/files.ipsec"
include "netipsec/files.netipsec"
include "netiso/files.netiso"
+include "netmpls/files.netmpls"
include "netnatm/files.netnatm"
include "netsmb/files.netsmb"
include "net/files.pf"
@@ -1273,7 +1274,7 @@
defpseudo gre: ifnet
defpseudo gif: ifnet
defpseudo faith: ifnet
-defpseudo mpls: ifnet
+defpseudo ifmpls: ifnet
defpseudo srt: ifnet
defpseudo stf: ifnet
defpseudodev tap: ifnet, ether, arp
@@ -1612,9 +1613,7 @@
file net/if_ieee1394subr.c ieee1394
file net/if_loop.c loop needs-flag
file net/if_media.c
-file net/if_mpls.c mpls needs-flag
-file netmpls/mpls_proto.c mpls
-file netmpls/mpls_ttl.c mpls
+file net/if_mpls.c ifmpls needs-flag
file net/if_ppp.c ppp needs-flag
file net/if_srt.c srt
file net/if_stf.c stf & inet & inet6 needs-flag
diff -r 6632105c0aec -r e6b25222ed89 sys/net/if_mpls.c
--- a/sys/net/if_mpls.c Sat Jun 26 14:50:14 2010 +0000
+++ b/sys/net/if_mpls.c Sat Jun 26 15:17:56 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mpls.c,v 1.1 2010/06/26 14:24:28 kefren Exp $ */
+/* $NetBSD: if_mpls.c,v 1.2 2010/06/26 15:17:56 kefren Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.1 2010/06/26 14:24:28 kefren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mpls.c,v 1.2 2010/06/26 15:17:56 kefren Exp $");
#include "opt_inet.h"
#include "opt_mpls.h"
@@ -66,7 +66,7 @@
#include "if_mpls.h"
-void mplsattach(int);
+void ifmplsattach(int);
static int mpls_clone_create(struct if_clone *, int);
static int mpls_clone_destroy(struct ifnet *);
@@ -99,7 +99,7 @@
/* ARGSUSED */
void
-mplsattach(int count)
+ifmplsattach(int count)
{
if_clone_attach(&mpls_if_cloner);
}
diff -r 6632105c0aec -r e6b25222ed89 sys/netmpls/files.netmpls
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/netmpls/files.netmpls Sat Jun 26 15:17:56 2010 +0000
@@ -0,0 +1,6 @@
+# $NetBSD: files.netmpls,v 1.1 2010/06/26 15:17:56 kefren Exp $
+
+defflag opt_mpls.h MPLS
+
+file netmpls/mpls_proto.c mpls
+file netmpls/mpls_ttl.c mpls
Home |
Main Index |
Thread Index |
Old Index