Module Name: src
Committed By: christos
Date: Sun Aug 7 10:44:05 UTC 2016
Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX-I NITROGEN6X
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/riscv/conf: GENERIC
src/sys/conf: files
Log Message:
rename ifmpls to mpls, so we don't have if_ifmpls...
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.436 -r1.437 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/NITROGEN6X
cvs rdiff -u -r1.400 -r1.401 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1138 -r1.1139 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/conf/GENERIC
cvs rdiff -u -r1.1160 -r1.1161 src/sys/conf/files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.37 src/sys/arch/amd64/conf/ALL:1.38
--- src/sys/arch/amd64/conf/ALL:1.37 Wed Jul 27 03:04:57 2016
+++ src/sys/arch/amd64/conf/ALL Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.37 2016/07/27 07:04:57 msaitoh Exp $
+# $NetBSD: ALL,v 1.38 2016/08/07 10:44:05 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.37 $"
+#ident "ALL-$Revision: 1.38 $"
maxusers 64 # estimated number of users
@@ -219,7 +219,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-options MPLS # MultiProtocol Label Switching (needs ifmpls)
+options MPLS # MultiProtocol Label Switching (needs mpls)
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -1551,7 +1551,7 @@ pseudo-device dm # device-mapper disk
pseudo-device bpfilter # Berkeley packet filter
pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
-pseudo-device ifmpls # MPLS pseudo-interface
+pseudo-device mpls # MPLS pseudo-interface
pseudo-device loop # network loopback
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.436 src/sys/arch/amd64/conf/GENERIC:1.437
--- src/sys/arch/amd64/conf/GENERIC:1.436 Wed Jul 27 03:04:57 2016
+++ src/sys/arch/amd64/conf/GENERIC Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.436 2016/07/27 07:04:57 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.437 2016/08/07 10:44:05 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.436 $"
+#ident "GENERIC-$Revision: 1.437 $"
maxusers 64 # estimated number of users
@@ -190,7 +190,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs mpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -1255,7 +1255,7 @@ pseudo-device bpfilter # Berkeley packe
#pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device ifmpls # MPLS pseudo-interface
+#pseudo-device mpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP
Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.1 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.2
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.1 Tue May 17 02:44:46 2016
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.1 2016/05/17 06:44:46 ryo Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.2 2016/08/07 10:44:05 christos Exp $
#
# ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
#
@@ -148,7 +148,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs mpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -344,7 +344,7 @@ pseudo-device bpfilter # Berkeley packe
#pseudo-device carp # Common Address Redundancy Protocol
#pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device ifmpls # MPLS pseudo-interface
+#pseudo-device mpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP
Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.5 src/sys/arch/evbarm/conf/CUBOX-I:1.6
--- src/sys/arch/evbarm/conf/CUBOX-I:1.5 Thu Dec 31 06:53:18 2015
+++ src/sys/arch/evbarm/conf/CUBOX-I Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.5 2015/12/31 11:53:18 ryo Exp $
+# $NetBSD: CUBOX-I,v 1.6 2016/08/07 10:44:05 christos Exp $
#
# CuBox-i
# - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -145,7 +145,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs mpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -366,7 +366,7 @@ pseudo-device bpfilter # Berkeley packe
#pseudo-device carp # Common Address Redundancy Protocol
#pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device ifmpls # MPLS pseudo-interface
+#pseudo-device mpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP
Index: src/sys/arch/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.7 src/sys/arch/evbarm/conf/NITROGEN6X:1.8
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.7 Thu Dec 31 06:53:18 2015
+++ src/sys/arch/evbarm/conf/NITROGEN6X Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.7 2015/12/31 11:53:18 ryo Exp $
+# $NetBSD: NITROGEN6X,v 1.8 2016/08/07 10:44:05 christos Exp $
#
# Nitrogen6X
# - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -145,7 +145,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs mpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -355,7 +355,7 @@ pseudo-device bpfilter # Berkeley packe
#pseudo-device carp # Common Address Redundancy Protocol
#pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device ifmpls # MPLS pseudo-interface
+#pseudo-device mpls # MPLS pseudo-interface
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
pseudo-device sl # Serial Line IP
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.400 src/sys/arch/i386/conf/ALL:1.401
--- src/sys/arch/i386/conf/ALL:1.400 Wed Jul 27 03:04:56 2016
+++ src/sys/arch/i386/conf/ALL Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.400 2016/07/27 07:04:56 msaitoh Exp $
+# $NetBSD: ALL,v 1.401 2016/08/07 10:44:05 christos Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.400 $"
+#ident "ALL-$Revision: 1.401 $"
maxusers 64 # estimated number of users
@@ -218,7 +218,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-options MPLS # MultiProtocol Label Switching (needs ifmpls)
+options MPLS # MultiProtocol Label Switching (needs mpls)
options MROUTING # IP multicast routing
options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -1740,7 +1740,7 @@ pseudo-device dm # device-mapper disk
pseudo-device bpfilter # Berkeley packet filter
pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
-pseudo-device ifmpls # MPLS pseudo-interface
+pseudo-device mpls # MPLS pseudo-interface
pseudo-device loop # network loopback
pseudo-device ppp # Point-to-Point Protocol
pseudo-device pppoe # PPP over Ethernet (RFC 2516)
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1138 src/sys/arch/i386/conf/GENERIC:1.1139
--- src/sys/arch/i386/conf/GENERIC:1.1138 Wed Jul 27 03:04:56 2016
+++ src/sys/arch/i386/conf/GENERIC Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1138 2016/07/27 07:04:56 msaitoh Exp $
+# $NetBSD: GENERIC,v 1.1139 2016/08/07 10:44:05 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1138 $"
+#ident "GENERIC-$Revision: 1.1139 $"
maxusers 64 # estimated number of users
@@ -203,7 +203,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs mpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
options NETATALK # AppleTalk networking protocols
@@ -1648,7 +1648,7 @@ pseudo-device bpfilter # Berkeley packe
#pseudo-device carp # Common Address Redundancy Protocol
pseudo-device ipfilter # IP filter (firewall) and NAT
pseudo-device loop # network loopback
-#pseudo-device ifmpls # MPLS pseudo-interface
+#pseudo-device mpls # 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
Index: src/sys/arch/riscv/conf/GENERIC
diff -u src/sys/arch/riscv/conf/GENERIC:1.2 src/sys/arch/riscv/conf/GENERIC:1.3
--- src/sys/arch/riscv/conf/GENERIC:1.2 Fri Aug 7 09:53:28 2015
+++ src/sys/arch/riscv/conf/GENERIC Sun Aug 7 06:44:05 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.2 2015/08/07 13:53:28 maxv Exp $
+# $NetBSD: GENERIC,v 1.3 2016/08/07 10:44:05 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/riscv/conf/std.riscv64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.2 $"
+#ident "GENERIC-$Revision: 1.3 $"
maxusers 64 # estimated number of users
@@ -109,7 +109,7 @@ options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
-#options MPLS # MultiProtocol Label Switching (needs ifmpls)
+#options MPLS # MultiProtocol Label Switching (needs mpls)
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
#options NETATALK # AppleTalk networking protocols
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1160 src/sys/conf/files:1.1161
--- src/sys/conf/files:1.1160 Thu Jun 23 03:32:12 2016
+++ src/sys/conf/files Sun Aug 7 06:44:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1160 2016/06/23 07:32:12 skrll Exp $
+# $NetBSD: files,v 1.1161 2016/08/07 10:44:04 christos Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20150846
@@ -1419,7 +1419,7 @@ defpseudo strip: ifnet
defpseudo gre: ifnet
defpseudo gif: ifnet
defpseudo faith: ifnet
-defpseudo ifmpls: ifnet
+defpseudo mpls: ifnet
defpseudo srt: ifnet
defpseudo stf: ifnet
defpseudodev tap: ifnet, ether, arp
