Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Remove the network ATM code.



details:   https://anonhg.NetBSD.org/src/rev/b734cf818cd6
branches:  trunk
changeset: 433288:b734cf818cd6
user:      maxv <maxv%NetBSD.org@localhost>
date:      Thu Sep 06 06:41:59 2018 +0000

description:
Remove the network ATM code.

diffstat:

 distrib/sets/lists/base/mi           |    8 +-
 distrib/sets/lists/comp/mi           |    8 +-
 distrib/sets/lists/debug/mi          |    6 +-
 distrib/sets/lists/man/mi            |   14 +-
 share/man/man7/hier.7                |    8 +-
 share/man/man7/src.7                 |    6 +-
 sys/compat/common/if_43.c            |    7 +-
 sys/compat/common/uipc_syscalls_43.c |    5 +-
 sys/compat/netbsd32/netbsd32_ioctl.h |    5 +-
 sys/conf/files                       |    6 +-
 sys/net/Makefile                     |    4 +-
 sys/net/files.net                    |    4 +-
 sys/net/if.c                         |    5 +-
 sys/net/if_atm.h                     |  164 ----------
 sys/net/if_atmsubr.c                 |  328 --------------------
 sys/net/netisr.h                     |    8 +-
 sys/net/netisr_dispatch.h            |    5 +-
 sys/netinet/Makefile                 |    4 +-
 sys/netinet/if_atm.c                 |  261 ----------------
 sys/netinet/if_atm.h                 |   39 --
 sys/netnatm/Makefile                 |    7 -
 sys/netnatm/files.netnatm            |    7 -
 sys/netnatm/natm.c                   |  547 -----------------------------------
 sys/netnatm/natm.h                   |  147 ---------
 sys/netnatm/natm_pcb.c               |  176 -----------
 sys/netnatm/natm_proto.c             |  120 -------
 usr.sbin/Makefile                    |    5 +-
 usr.sbin/pvcsif/Makefile             |   12 -
 usr.sbin/pvcsif/pvcsif.8             |   53 ---
 usr.sbin/pvcsif/pvcsif.c             |  149 ---------
 usr.sbin/pvctxctl/Makefile           |   12 -
 usr.sbin/pvctxctl/pvctxctl.8         |  154 ---------
 usr.sbin/pvctxctl/pvctxctl.c         |  201 ------------
 33 files changed, 40 insertions(+), 2445 deletions(-)

diffs (truncated from 2899 to 300 lines):

diff -r 88aa54df3e63 -r b734cf818cd6 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Thu Sep 06 05:36:49 2018 +0000
+++ b/distrib/sets/lists/base/mi        Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1183 2018/08/12 17:11:55 christos Exp $
+# $NetBSD: mi,v 1.1184 2018/09/06 06:41:59 maxv Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -1217,7 +1217,7 @@
 ./usr/include/netiso                           base-obsolete           obsolete
 ./usr/include/netkey                           base-c-usr
 ./usr/include/netmpls                          base-c-usr
-./usr/include/netnatm                          base-c-usr
+./usr/include/netnatm                          base-obsolete           obsolete
 ./usr/include/netns                            base-obsolete           obsolete
 ./usr/include/netpgp                           base-c-usr
 ./usr/include/netsmb                           base-c-usr
@@ -1878,8 +1878,8 @@
 ./usr/sbin/procsystime                         base-debug-bin          dtrace
 ./usr/sbin/psrset                              base-sysutil-bin
 ./usr/sbin/pstat                               base-sysutil-bin
-./usr/sbin/pvcsif                              base-netutil-bin
-./usr/sbin/pvctxctl                            base-netutil-bin
+./usr/sbin/pvcsif                              base-obsolete           obsolete
+./usr/sbin/pvctxctl                            base-obsolete           obsolete
 ./usr/sbin/pwd_mkdb                            base-sysutil-bin
 ./usr/sbin/quot                                        base-sysutil-bin
 ./usr/sbin/quotacheck                          base-sysutil-bin
diff -r 88aa54df3e63 -r b734cf818cd6 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Thu Sep 06 05:36:49 2018 +0000
+++ b/distrib/sets/lists/comp/mi        Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2225 2018/09/03 21:26:19 kre Exp $
+#      $NetBSD: mi,v 1.2226 2018/09/06 06:41:59 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -2295,7 +2295,7 @@
 ./usr/include/net/if.h                         comp-c-include
 ./usr/include/net/if_arc.h                     comp-c-include
 ./usr/include/net/if_arp.h                     comp-c-include
-./usr/include/net/if_atm.h                     comp-c-include
+./usr/include/net/if_atm.h                     comp-obsolete           obsolete
 ./usr/include/net/if_bridgevar.h               comp-c-include
 ./usr/include/net/if_dl.h                      comp-c-include
 ./usr/include/net/if_ether.h                   comp-c-include
@@ -2384,7 +2384,7 @@
 ./usr/include/netinet/icmp6.h                  comp-c-include
 ./usr/include/netinet/icmp_var.h               comp-c-include
 ./usr/include/netinet/if_arc.h                 comp-obsolete           obsolete
-./usr/include/netinet/if_atm.h                 comp-c-include
+./usr/include/netinet/if_atm.h                 comp-obsolete           obsolete
 ./usr/include/netinet/if_ether.h               comp-c-include
 ./usr/include/netinet/if_inarp.h               comp-c-include
 ./usr/include/netinet/igmp.h                   comp-c-include
@@ -2513,7 +2513,7 @@
 ./usr/include/netkey/keysock.h                 comp-c-include
 ./usr/include/netkey/keyv2.h                   comp-obsolete           obsolete
 ./usr/include/netmpls/mpls.h                   comp-c-include
-./usr/include/netnatm/natm.h                   comp-c-include
+./usr/include/netnatm/natm.h                   comp-obsolete           obsolete
 ./usr/include/netns/idp.h                      comp-obsolete           obsolete
 ./usr/include/netns/idp_var.h                  comp-obsolete           obsolete
 ./usr/include/netns/ns.h                       comp-obsolete           obsolete
diff -r 88aa54df3e63 -r b734cf818cd6 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Thu Sep 06 05:36:49 2018 +0000
+++ b/distrib/sets/lists/debug/mi       Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.263 2018/08/21 11:09:18 christos Exp $
+# $NetBSD: mi,v 1.264 2018/09/06 06:41:59 maxv Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/lib                                      comp-sys-usr            compatdir
 ./usr/lib/i18n/libBIG5_g.a                     comp-c-debuglib         debuglib,compatfile
@@ -1209,8 +1209,8 @@
 ./usr/libdata/debug/usr/sbin/pppstats.debug    comp-ppp-debug          debug
 ./usr/libdata/debug/usr/sbin/psrset.debug      comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/pstat.debug       comp-sysutil-debug      debug
-./usr/libdata/debug/usr/sbin/pvcsif.debug      comp-netutil-debug      debug
-./usr/libdata/debug/usr/sbin/pvctxctl.debug    comp-netutil-debug      debug
+./usr/libdata/debug/usr/sbin/pvcsif.debug      comp-obsolete           obsolete
+./usr/libdata/debug/usr/sbin/pvctxctl.debug    comp-obsolete           obsolete
 ./usr/libdata/debug/usr/sbin/pwd_mkdb.debug    comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/quot.debug                comp-sysutil-debug      debug
 ./usr/libdata/debug/usr/sbin/quotacheck.debug  comp-sysutil-debug      debug
diff -r 88aa54df3e63 -r b734cf818cd6 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Thu Sep 06 05:36:49 2018 +0000
+++ b/distrib/sets/lists/man/mi Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1613 2018/09/06 05:36:49 maxv Exp $
+# $NetBSD: mi,v 1.1614 2018/09/06 06:41:59 maxv Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2928,8 +2928,8 @@
 ./usr/share/man/cat8/pvchange.0                        man-lvm-catman          lvm,.cat
 ./usr/share/man/cat8/pvck.0                    man-lvm-catman          lvm,.cat
 ./usr/share/man/cat8/pvcreate.0                        man-lvm-catman          lvm,.cat
-./usr/share/man/cat8/pvcsif.0                  man-netutil-catman      .cat
-./usr/share/man/cat8/pvctxctl.0                        man-netutil-catman      .cat
+./usr/share/man/cat8/pvcsif.0                  man-obsolete            obsolete
+./usr/share/man/cat8/pvctxctl.0                        man-obsolete            obsolete
 ./usr/share/man/cat8/pvdisplay.0               man-lvm-catman          lvm,.cat
 ./usr/share/man/cat8/pvmove.0                  man-lvm-catman          lvm,.cat
 ./usr/share/man/cat8/pvremove.0                        man-lvm-catman          lvm,.cat
@@ -5829,8 +5829,8 @@
 ./usr/share/man/html8/pvchange.html            man-lvm-htmlman         lvm,html
 ./usr/share/man/html8/pvck.html                        man-lvm-htmlman         lvm,html
 ./usr/share/man/html8/pvcreate.html            man-lvm-htmlman         lvm,html
-./usr/share/man/html8/pvcsif.html              man-netutil-htmlman     html
-./usr/share/man/html8/pvctxctl.html            man-netutil-htmlman     html
+./usr/share/man/html8/pvcsif.html              man-obsolete            obsolete
+./usr/share/man/html8/pvctxctl.html            man-obsolete            obsolete
 ./usr/share/man/html8/pvdisplay.html           man-lvm-htmlman         lvm,html
 ./usr/share/man/html8/pvmove.html              man-lvm-htmlman         lvm,html
 ./usr/share/man/html8/pvremove.html            man-lvm-htmlman         lvm,html
@@ -9002,8 +9002,8 @@
 ./usr/share/man/man8/pvchange.8                        man-lvm-man             lvm,.man
 ./usr/share/man/man8/pvck.8                    man-lvm-man             lvm,.man
 ./usr/share/man/man8/pvcreate.8                        man-lvm-man             lvm,.man
-./usr/share/man/man8/pvcsif.8                  man-netutil-man         .man
-./usr/share/man/man8/pvctxctl.8                        man-netutil-man         .man
+./usr/share/man/man8/pvcsif.8                  man-obsolete            obsolete
+./usr/share/man/man8/pvctxctl.8                        man-obsolete            obsolete
 ./usr/share/man/man8/pvdisplay.8               man-lvm-man             lvm,.man
 ./usr/share/man/man8/pvmove.8                  man-lvm-man             lvm,.man
 ./usr/share/man/man8/pvremove.8                        man-lvm-man             lvm,.man
diff -r 88aa54df3e63 -r b734cf818cd6 share/man/man7/hier.7
--- a/share/man/man7/hier.7     Thu Sep 06 05:36:49 2018 +0000
+++ b/share/man/man7/hier.7     Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: hier.7,v 1.130 2018/07/15 05:16:41 maxv Exp $
+.\"    $NetBSD: hier.7,v 1.131 2018/09/06 06:41:59 maxv Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"    The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"    @(#)hier.7      8.5 (Berkeley) 6/1/94
 .\"
-.Dd July 14, 2018
+.Dd September 6, 2018
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -464,8 +464,6 @@
 .It Pa netkey/
 Include files for secret key management, used for security protocols; see
 .Xr ipsec 4 .
-.It Pa netnatm/
-C include files for native mode ATM.
 .It Pa nfs/
 C include files for NFS (Network File System).
 .It Pa protocols/
@@ -1017,8 +1015,6 @@
 IPv6 networking support.
 .It Pa netkey/
 Key database for IPsec networking support.
-.It Pa netnatm/
-ATM networking support.
 .It Pa nfs/
 NFS (network file system) support, both client and server.
 .It Pa stand/
diff -r 88aa54df3e63 -r b734cf818cd6 share/man/man7/src.7
--- a/share/man/man7/src.7      Thu Sep 06 05:36:49 2018 +0000
+++ b/share/man/man7/src.7      Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: src.7,v 1.12 2018/07/15 05:16:41 maxv Exp $
+.\" $NetBSD: src.7,v 1.13 2018/09/06 06:41:59 maxv Exp $
 .\"
 .\" Copyright (c) 2012, 2013 Mingzhe Wang and Elvira Khabirova.
 .\"    All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd July 14, 2018
+.Dd September 6, 2018
 .Dt SRC 7
 .Os
 .Sh NAME
@@ -310,8 +310,6 @@
 .It Pa netmpls/
 MPLS protocol stack
 .Xr mpls 4 .
-.It Pa netnatm/
-Native Mode ATM protocol stack.
 .It Pa netsmb/
 SMB network protocol stack.
 .It Pa nfs/
diff -r 88aa54df3e63 -r b734cf818cd6 sys/compat/common/if_43.c
--- a/sys/compat/common/if_43.c Thu Sep 06 05:36:49 2018 +0000
+++ b/sys/compat/common/if_43.c Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_43.c,v 1.14 2017/07/29 04:08:47 riastradh Exp $     */
+/*     $NetBSD: if_43.c,v 1.15 2018/09/06 06:41:59 maxv Exp $  */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14 2017/07/29 04:08:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.15 2018/09/06 06:41:59 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -64,7 +64,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/if_gre.h>
-#include <net/if_atm.h>
 #include <net/if_tap.h>
 #include <net80211/ieee80211_ioctl.h>
 #include <netinet6/in6_var.h>
@@ -179,7 +178,6 @@
                case SIOCGIFPSRCADDR_IN6:
                case SIOCGIFSTAT_ICMP6:
                case SIOCGIFSTAT_IN6:
-               case SIOCGPVCSIF:
                case SIOCGVH:
                case SIOCIFCREATE:
                case SIOCIFDESTROY:
@@ -199,7 +197,6 @@
                case SIOCSIFNETMASK_IN6:
                case SIOCSNDFLUSH_IN6:
                case SIOCSPFXFLUSH_IN6:
-               case SIOCSPVCSIF:
                case SIOCSRTRFLUSH_IN6:
                case SIOCSVH:
                case TAPGIFNAME:
diff -r 88aa54df3e63 -r b734cf818cd6 sys/compat/common/uipc_syscalls_43.c
--- a/sys/compat/common/uipc_syscalls_43.c      Thu Sep 06 05:36:49 2018 +0000
+++ b/sys/compat/common/uipc_syscalls_43.c      Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls_43.c,v 1.49 2018/05/03 21:43:33 christos Exp $   */
+/*     $NetBSD: uipc_syscalls_43.c,v 1.50 2018/09/06 06:41:59 maxv Exp $       */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.49 2018/05/03 21:43:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls_43.c,v 1.50 2018/09/06 06:41:59 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -61,7 +61,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/if_gre.h>
-#include <net/if_atm.h>
 #include <net/if_tap.h>
 #include <net80211/ieee80211_ioctl.h>
 #include <netinet6/in6_var.h>
diff -r 88aa54df3e63 -r b734cf818cd6 sys/compat/netbsd32/netbsd32_ioctl.h
--- a/sys/compat/netbsd32/netbsd32_ioctl.h      Thu Sep 06 05:36:49 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_ioctl.h      Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_ioctl.h,v 1.60 2018/09/02 16:13:42 maxv Exp $ */
+/*     $NetBSD: netbsd32_ioctl.h,v 1.61 2018/09/06 06:41:59 maxv Exp $ */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -213,9 +213,6 @@
 net/if_ppp.h:110:#define PPPIOCSPASS   _IOW('t', 71, struct bpf_program) /* set pass filter */
 net/if_ppp.h:111:#define PPPIOCSACTIVE _IOW('t', 70, struct bpf_program) /* set active filt */
 
-net/if_atm.h:88:#define SIOCATMENA     _IOWR('a', 123, struct atm_pseudoioctl) /* enable */
-net/if_atm.h:89:#define SIOCATMDIS     _IOWR('a', 124, struct atm_pseudoioctl) /* disable */
-
 net/if_ppp.h:105:#define PPPIOCSCOMPRESS       _IOW('t', 77, struct ppp_option_data)
 
 sys/module.h?
diff -r 88aa54df3e63 -r b734cf818cd6 sys/conf/files
--- a/sys/conf/files    Thu Sep 06 05:36:49 2018 +0000
+++ b/sys/conf/files    Thu Sep 06 06:41:59 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1205 2018/09/06 05:36:51 maxv Exp $
+#      $NetBSD: files,v 1.1206 2018/09/06 06:42:00 maxv Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -237,7 +237,6 @@
 include "netinet6/files.netinet6"
 include "netipsec/files.netipsec"
 include "netmpls/files.netmpls"
-include "netnatm/files.netnatm"
 include "netsmb/files.netsmb"
 
 include "net/npf/files.npf"
@@ -418,10 +417,9 @@
 include "dev/videomode/files.videomode"
 
 # net device attributes - we have generic code for arc(net), ether(net),
-# fddi, token ring, and atm.
+# fddi, and token ring.



Home | Main Index | Thread Index | Old Index