Module Name: src
Committed By: maxv
Date: Thu Sep 6 06:42:00 UTC 2018
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/man: mi
src/share/man/man7: hier.7 src.7
src/sys/compat/common: if_43.c uipc_syscalls_43.c
src/sys/compat/netbsd32: netbsd32_ioctl.h
src/sys/conf: files
src/sys/net: Makefile files.net if.c netisr.h netisr_dispatch.h
src/sys/netinet: Makefile
src/usr.sbin: Makefile
Removed Files:
src/sys/net: if_atm.h if_atmsubr.c
src/sys/netinet: if_atm.c if_atm.h
src/sys/netnatm: Makefile files.netnatm natm.c natm.h natm_pcb.c
natm_proto.c
src/usr.sbin/pvcsif: Makefile pvcsif.8 pvcsif.c
src/usr.sbin/pvctxctl: Makefile pvctxctl.8 pvctxctl.c
Log Message:
Remove the network ATM code.
To generate a diff of this commit:
cvs rdiff -u -r1.1183 -r1.1184 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2225 -r1.2226 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.263 -r1.264 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1613 -r1.1614 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.130 -r1.131 src/share/man/man7/hier.7
cvs rdiff -u -r1.12 -r1.13 src/share/man/man7/src.7
cvs rdiff -u -r1.14 -r1.15 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/common/uipc_syscalls_43.c
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/netbsd32/netbsd32_ioctl.h
cvs rdiff -u -r1.1205 -r1.1206 src/sys/conf/files
cvs rdiff -u -r1.37 -r1.38 src/sys/net/Makefile
cvs rdiff -u -r1.17 -r1.18 src/sys/net/files.net
cvs rdiff -u -r1.434 -r1.435 src/sys/net/if.c
cvs rdiff -u -r1.21 -r0 src/sys/net/if_atm.h
cvs rdiff -u -r1.61 -r0 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.45 -r1.46 src/sys/net/netisr.h
cvs rdiff -u -r1.19 -r1.20 src/sys/net/netisr_dispatch.h
cvs rdiff -u -r1.29 -r1.30 src/sys/netinet/Makefile
cvs rdiff -u -r1.39 -r0 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.13 -r0 src/sys/netinet/if_atm.h
cvs rdiff -u -r1.2 -r0 src/sys/netnatm/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/netnatm/files.netnatm
cvs rdiff -u -r1.53 -r0 src/sys/netnatm/natm.c
cvs rdiff -u -r1.15 -r0 src/sys/netnatm/natm.h
cvs rdiff -u -r1.17 -r0 src/sys/netnatm/natm_pcb.c
cvs rdiff -u -r1.18 -r0 src/sys/netnatm/natm_proto.c
cvs rdiff -u -r1.277 -r1.278 src/usr.sbin/Makefile
cvs rdiff -u -r1.2 -r0 src/usr.sbin/pvcsif/Makefile
cvs rdiff -u -r1.4 -r0 src/usr.sbin/pvcsif/pvcsif.8
cvs rdiff -u -r1.5 -r0 src/usr.sbin/pvcsif/pvcsif.c
cvs rdiff -u -r1.2 -r0 src/usr.sbin/pvctxctl/Makefile
cvs rdiff -u -r1.7 -r0 src/usr.sbin/pvctxctl/pvctxctl.8 \
src/usr.sbin/pvctxctl/pvctxctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1183 src/distrib/sets/lists/base/mi:1.1184
--- src/distrib/sets/lists/base/mi:1.1183 Sun Aug 12 17:11:55 2018
+++ src/distrib/sets/lists/base/mi Thu Sep 6 06:41:59 2018
@@ -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
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2225 src/distrib/sets/lists/comp/mi:1.2226
--- src/distrib/sets/lists/comp/mi:1.2225 Mon Sep 3 21:26:19 2018
+++ src/distrib/sets/lists/comp/mi Thu Sep 6 06:41:59 2018
@@ -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
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.263 src/distrib/sets/lists/debug/mi:1.264
--- src/distrib/sets/lists/debug/mi:1.263 Tue Aug 21 11:09:18 2018
+++ src/distrib/sets/lists/debug/mi Thu Sep 6 06:41:59 2018
@@ -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
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1613 src/distrib/sets/lists/man/mi:1.1614
--- src/distrib/sets/lists/man/mi:1.1613 Thu Sep 6 05:36:49 2018
+++ src/distrib/sets/lists/man/mi Thu Sep 6 06:41:59 2018
@@ -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
Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.130 src/share/man/man7/hier.7:1.131
--- src/share/man/man7/hier.7:1.130 Sun Jul 15 05:16:41 2018
+++ src/share/man/man7/hier.7 Thu Sep 6 06:41:59 2018
@@ -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 @@ Include files for Internet protocol vers
.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 @@ IP networking support.
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/
Index: src/share/man/man7/src.7
diff -u src/share/man/man7/src.7:1.12 src/share/man/man7/src.7:1.13
--- src/share/man/man7/src.7:1.12 Sun Jul 15 05:16:41 2018
+++ src/share/man/man7/src.7 Thu Sep 6 06:41:59 2018
@@ -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 @@ Key management for IPsec.
.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/
Index: src/sys/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.14 src/sys/compat/common/if_43.c:1.15
--- src/sys/compat/common/if_43.c:1.14 Sat Jul 29 04:08:47 2017
+++ src/sys/compat/common/if_43.c Thu Sep 6 06:41:59 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.
#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 @@ compat_cvtcmd(u_long cmd)
case SIOCGIFPSRCADDR_IN6:
case SIOCGIFSTAT_ICMP6:
case SIOCGIFSTAT_IN6:
- case SIOCGPVCSIF:
case SIOCGVH:
case SIOCIFCREATE:
case SIOCIFDESTROY:
@@ -199,7 +197,6 @@ compat_cvtcmd(u_long cmd)
case SIOCSIFNETMASK_IN6:
case SIOCSNDFLUSH_IN6:
case SIOCSPFXFLUSH_IN6:
- case SIOCSPVCSIF:
case SIOCSRTRFLUSH_IN6:
case SIOCSVH:
case TAPGIFNAME:
Index: src/sys/compat/common/uipc_syscalls_43.c
diff -u src/sys/compat/common/uipc_syscalls_43.c:1.49 src/sys/compat/common/uipc_syscalls_43.c:1.50
--- src/sys/compat/common/uipc_syscalls_43.c:1.49 Thu May 3 21:43:33 2018
+++ src/sys/compat/common/uipc_syscalls_43.c Thu Sep 6 06:41:59 2018
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_syscall
#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>
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.60 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.61
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.60 Sun Sep 2 16:13:42 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Thu Sep 6 06:41:59 2018
@@ -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 @@ dev/wscons/wsconsio.h:241:#define WSDISP
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?
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1205 src/sys/conf/files:1.1206
--- src/sys/conf/files:1.1205 Thu Sep 6 05:36:51 2018
+++ src/sys/conf/files Thu Sep 6 06:42:00 2018
@@ -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 "netinet/files.netinet"
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/splash/files.splash"
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.
#
define arcnet
-define atm
define ether
define fddi
define hippi
Index: src/sys/net/Makefile
diff -u src/sys/net/Makefile:1.37 src/sys/net/Makefile:1.38
--- src/sys/net/Makefile:1.37 Tue Aug 14 14:49:13 2018
+++ src/sys/net/Makefile Thu Sep 6 06:42:00 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2018/08/14 14:49:13 maxv Exp $
+# $NetBSD: Makefile,v 1.38 2018/09/06 06:42:00 maxv Exp $
INCSDIR= /usr/include/net
INCS= bpf.h bpfjit.h bpfdesc.h dlt.h ethertypes.h if.h if_arc.h if_arp.h \
- if_atm.h if_bridgevar.h if_dl.h if_ether.h if_fddi.h if_gif.h \
+ if_bridgevar.h if_dl.h if_ether.h if_fddi.h if_gif.h \
if_gre.h if_hippi.h if_ieee1394.h if_ipsec.h if_llc.h if_media.h if_mpls.h \
if_pflog.h if_ppp.h if_pppoe.h if_l2tp.h if_sppp.h if_srt.h if_stf.h \
if_tap.h if_token.h if_tun.h if_types.h if_vlanvar.h net_stats.h \
Index: src/sys/net/files.net
diff -u src/sys/net/files.net:1.17 src/sys/net/files.net:1.18
--- src/sys/net/files.net:1.17 Tue Aug 14 14:49:13 2018
+++ src/sys/net/files.net Thu Sep 6 06:42:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.net,v 1.17 2018/08/14 14:49:13 maxv Exp $
+# $NetBSD: files.net,v 1.18 2018/09/06 06:42:00 maxv Exp $
# XXX CLEANUP
define net
@@ -9,7 +9,6 @@ file net/bsd-comp.c ppp & ppp_bsdcomp
file net/dl_print.c
file net/if.c net
file net/if_arcsubr.c arcnet needs-flag
-file net/if_atmsubr.c atm
file net/if_bridge.c bridge needs-flag
file net/bridgestp.c bridge
file net/if_ethersubr.c ether | fddi | netatalk | token |
@@ -55,7 +54,6 @@ file netinet/accf_data.c accf_data
file netinet/accf_http.c accf_http
file netinet/cpu_in_cksum.c (inet | inet6) & !cpu_in_cksum
file netinet/if_arp.c arp | netatalk needs-flag
-file netinet/if_atm.c atm
file netinet/in4_cksum.c inet
file netinet/in_cksum.c inet
file netinet/in_gif.c gif & inet
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.434 src/sys/net/if.c:1.435
--- src/sys/net/if.c:1.434 Mon Aug 27 04:53:24 2018
+++ src/sys/net/if.c Thu Sep 6 06:42:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.434 2018/08/27 04:53:24 ozaki-r Exp $ */
+/* $NetBSD: if.c,v 1.435 2018/09/06 06:42:00 maxv Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,13 +90,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.434 2018/08/27 04:53:24 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.435 2018/09/06 06:42:00 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
#include "opt_ipsec.h"
#include "opt_atalk.h"
-#include "opt_natm.h"
#include "opt_wlan.h"
#include "opt_net_mpsafe.h"
#include "opt_mrouting.h"
Index: src/sys/net/netisr.h
diff -u src/sys/net/netisr.h:1.45 src/sys/net/netisr.h:1.46
--- src/sys/net/netisr.h:1.45 Sat May 27 21:02:56 2017
+++ src/sys/net/netisr.h Thu Sep 6 06:42:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netisr.h,v 1.45 2017/05/27 21:02:56 bouyer Exp $ */
+/* $NetBSD: netisr.h,v 1.46 2018/09/06 06:42:00 maxv Exp $ */
/*
* Copyright (c) 1980, 1986, 1989, 1993
@@ -52,7 +52,6 @@
#include "opt_inet.h"
#include "opt_atalk.h"
#include "opt_mpls.h"
-#include "opt_natm.h"
#include "opt_can.h"
#include "arp.h"
#endif /* defined(_KERNEL_OPT) */
@@ -63,7 +62,7 @@
#include <sys/socket.h>
/*
- * XXX IFNAMSIZE for if_ppp.h, natm.h; struct ifnet decl for in6.h, in.h;
+ * XXX IFNAMSIZE for if_ppp.h; struct ifnet decl for in6.h, in.h;
* XXX struct mbuf decl for in6.h, in.h, route.h (via in_var.h).
*/
#include <net/if.h>
@@ -85,9 +84,6 @@
#ifdef MPLS
#include <netmpls/mpls_var.h>
#endif
-#ifdef NATM
-#include <netnatm/natm.h>
-#endif
#ifdef NETATALK
#include <netatalk/at_extern.h>
#endif
Index: src/sys/net/netisr_dispatch.h
diff -u src/sys/net/netisr_dispatch.h:1.19 src/sys/net/netisr_dispatch.h:1.20
--- src/sys/net/netisr_dispatch.h:1.19 Sat May 27 21:02:56 2017
+++ src/sys/net/netisr_dispatch.h Thu Sep 6 06:42:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netisr_dispatch.h,v 1.19 2017/05/27 21:02:56 bouyer Exp $ */
+/* $NetBSD: netisr_dispatch.h,v 1.20 2018/09/06 06:42:00 maxv Exp $ */
#ifndef _NET_NETISR_DISPATCH_H_
#define _NET_NETISR_DISPATCH_H_
@@ -38,9 +38,6 @@
#ifdef MPLS
DONETISR(NETISR_MPLS,mplsintr);
#endif
-#ifdef NATM
- DONETISR(NETISR_NATM,natmintr);
-#endif
#ifdef CAN
DONETISR(NETISR_CAN,canintr);
#endif
Index: src/sys/netinet/Makefile
diff -u src/sys/netinet/Makefile:1.29 src/sys/netinet/Makefile:1.30
--- src/sys/netinet/Makefile:1.29 Wed Jul 11 11:13:16 2018
+++ src/sys/netinet/Makefile Thu Sep 6 06:42:00 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2018/07/11 11:13:16 kre Exp $
+# $NetBSD: Makefile,v 1.30 2018/09/06 06:42:00 maxv Exp $
INCSDIR= /usr/include/netinet
-INCS= dccp.h icmp6.h icmp_var.h if_atm.h if_ether.h if_inarp.h igmp.h \
+INCS= dccp.h icmp6.h icmp_var.h if_ether.h if_inarp.h igmp.h \
igmp_var.h in.h in_gif.h in_l2tp.h in_pcb.h in_pcb_hdr.h \
in_offload.h in_selsrc.h in_systm.h \
in_var.h ip.h ip_carp.h ip6.h ip_ecn.h ip_encap.h \
Index: src/usr.sbin/Makefile
diff -u src/usr.sbin/Makefile:1.277 src/usr.sbin/Makefile:1.278
--- src/usr.sbin/Makefile:1.277 Sat Aug 25 11:06:00 2018
+++ src/usr.sbin/Makefile Thu Sep 6 06:42:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.277 2018/08/25 11:06:00 martin Exp $
+# $NetBSD: Makefile,v 1.278 2018/09/06 06:42:00 maxv Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -52,9 +52,6 @@ SUBDIR+=faithd ifmcstat ip6addrctl ndp r
SUBDIR+=mld6query route6d rtadvd traceroute6
.endif
-# ATM PVC
-SUBDIR+=pvcsif pvctxctl
-
SUBDIR+= racoon racoonctl
# NPF
