[src/trunk]: src/sys rename ifmpls to mpls, so we don't have if_ifmpls...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys rename ifmpls to mpls, so we don't have if_ifmpls...
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 20:22:11 +0000
details:   https://anonhg.NetBSD.org/src/rev/c0c01af0bb70
branches:  trunk
changeset: 346939:c0c01af0bb70
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Aug 07 10:44:04 2016 +0000

description:
rename ifmpls to mpls, so we don't have if_ifmpls...

diffstat:

 sys/arch/amd64/conf/ALL               |  8 ++++----
 sys/arch/amd64/conf/GENERIC           |  8 ++++----
 sys/arch/evbarm/conf/ARMADILLO-IOT-G3 |  6 +++---
 sys/arch/evbarm/conf/CUBOX-I          |  6 +++---
 sys/arch/evbarm/conf/NITROGEN6X       |  6 +++---
 sys/arch/i386/conf/ALL                |  8 ++++----
 sys/arch/i386/conf/GENERIC            |  8 ++++----
 sys/arch/riscv/conf/GENERIC           |  6 +++---
 sys/conf/files                        |  4 ++--
 9 files changed, 30 insertions(+), 30 deletions(-)

diffs (270 lines):

diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/amd64/conf/ALL   Sun Aug 07 10:44:04 2016 +0000
@@ -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 @@
 
 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        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  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)
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Aug 07 10:44:04 2016 +0000
@@ -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 @@
 
 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        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 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
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/evbarm/conf/ARMADILLO-IOT-G3
--- a/sys/arch/evbarm/conf/ARMADILLO-IOT-G3     Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO-IOT-G3     Sun Aug 07 10:44:04 2016 +0000
@@ -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        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 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
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/evbarm/conf/CUBOX-I
--- a/sys/arch/evbarm/conf/CUBOX-I      Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/evbarm/conf/CUBOX-I      Sun Aug 07 10:44:04 2016 +0000
@@ -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        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 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
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/evbarm/conf/NITROGEN6X
--- a/sys/arch/evbarm/conf/NITROGEN6X   Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/evbarm/conf/NITROGEN6X   Sun Aug 07 10:44:04 2016 +0000
@@ -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        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 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
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/i386/conf/ALL    Sun Aug 07 10:44:04 2016 +0000
@@ -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 @@
 
 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        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  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)
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sun Aug 07 10:44:04 2016 +0000
@@ -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 @@
 
 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        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 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
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/arch/riscv/conf/GENERIC
--- a/sys/arch/riscv/conf/GENERIC       Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/arch/riscv/conf/GENERIC       Sun Aug 07 10:44:04 2016 +0000
@@ -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 @@
 
 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        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
diff -r f4a5326e52a0 -r c0c01af0bb70 sys/conf/files
--- a/sys/conf/files    Sun Aug 07 10:39:59 2016 +0000
+++ b/sys/conf/files    Sun Aug 07 10:44:04 2016 +0000
@@ -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 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
Prev by Date: [src/trunk]: src/distrib/sets/lists/modules Sets for new modules
Next by Date: [src/trunk]: src/sys/modules add new modules
Previous by Thread: [src/trunk]: src/distrib/sets/lists/modules Sets for new modules
Next by Thread: [src/trunk]: src/sys/modules add new modules
Indexes:
Home | Main Index | Thread Index | Old Index