svn commit: r317383 - in head: . etc/mtree include lib/libc/net rescue/rescue sbin sbin/atm sbin/atm/atmconfig share/man/man4 sys/boot/forth sys/conf sys/dev/en sys/dev/fatm sys/dev/hatm sys/dev/pa...

Brooks Davis brooks at FreeBSD.org
Mon Apr 24 21:21:53 UTC 2017


Author: brooks
Date: Mon Apr 24 21:21:49 2017
New Revision: 317383
URL: https://svnweb.freebsd.org/changeset/base/317383

Log:
  Remove the NATM framework including the en(4), fatm(4), hatm(4), and
  patm(4) devices.
  
  Maintaining an address family and framework has real costs when we make
  infrastructure improvements.  In the case of NATM we support no devices
  manufactured in the last 20 years and some will not even work in modern
  motherboards (some newer devices that patm(4) could be updated to
  support apparently exist, but we do not currently have support).
  
  With this change, support remains for some netgraph modules that don't
  require NATM support code. It is unclear if all these should remain,
  though ng_atmllc certainly stands alone.
  
  Note well: FreeBSD 11 supports NATM and will continue to do so until at
  least September 30, 2021.  Improvements to the code in FreeBSD 11 are
  certainly welcome.
  
  Reviewed by:	philip
  Approved by:	harti

Deleted:
  head/sbin/atm/Makefile
  head/sbin/atm/Makefile.inc
  head/sbin/atm/atmconfig/Makefile
  head/sbin/atm/atmconfig/Makefile.depend
  head/sbin/atm/atmconfig/atm_oid.list
  head/sbin/atm/atmconfig/atmconfig.8
  head/sbin/atm/atmconfig/atmconfig.h
  head/sbin/atm/atmconfig/atmconfig.help
  head/sbin/atm/atmconfig/atmconfig_device.c
  head/sbin/atm/atmconfig/atmconfig_device.h
  head/sbin/atm/atmconfig/atmconfig_device.help
  head/sbin/atm/atmconfig/diag.c
  head/sbin/atm/atmconfig/diag.h
  head/sbin/atm/atmconfig/main.c
  head/sbin/atm/atmconfig/natm.c
  head/sbin/atm/atmconfig/private.h
  head/share/man/man4/en.4
  head/share/man/man4/fatm.4
  head/share/man/man4/hatm.4
  head/share/man/man4/natm.4
  head/share/man/man4/natmip.4
  head/share/man/man4/ng_atm.4
  head/share/man/man4/patm.4
  head/share/man/man4/utopia.4
  head/sys/dev/en/if_en_pci.c
  head/sys/dev/en/midway.c
  head/sys/dev/en/midwayreg.h
  head/sys/dev/en/midwayvar.h
  head/sys/dev/fatm/firmware.h
  head/sys/dev/fatm/if_fatm.c
  head/sys/dev/fatm/if_fatm_rate.h
  head/sys/dev/fatm/if_fatmreg.h
  head/sys/dev/fatm/if_fatmvar.h
  head/sys/dev/hatm/if_hatm.c
  head/sys/dev/hatm/if_hatm_intr.c
  head/sys/dev/hatm/if_hatm_ioctl.c
  head/sys/dev/hatm/if_hatm_rx.c
  head/sys/dev/hatm/if_hatm_tx.c
  head/sys/dev/hatm/if_hatmconf.h
  head/sys/dev/hatm/if_hatmreg.h
  head/sys/dev/hatm/if_hatmvar.h
  head/sys/dev/patm/genrtab/Makefile
  head/sys/dev/patm/genrtab/genrtab.c
  head/sys/dev/patm/idt77252reg.h
  head/sys/dev/patm/if_patm.c
  head/sys/dev/patm/if_patm_attach.c
  head/sys/dev/patm/if_patm_intr.c
  head/sys/dev/patm/if_patm_ioctl.c
  head/sys/dev/patm/if_patm_rtables.c
  head/sys/dev/patm/if_patm_rx.c
  head/sys/dev/patm/if_patm_tx.c
  head/sys/dev/patm/if_patmvar.h
  head/sys/dev/utopia/idtphy.c
  head/sys/dev/utopia/idtphy.h
  head/sys/dev/utopia/suni.c
  head/sys/dev/utopia/suni.h
  head/sys/dev/utopia/utopia.c
  head/sys/dev/utopia/utopia.h
  head/sys/dev/utopia/utopia_priv.h
  head/sys/modules/en/Makefile
  head/sys/modules/fatm/Makefile
  head/sys/modules/hatm/Makefile
  head/sys/modules/netgraph/atm/atm/Makefile
  head/sys/modules/patm/Makefile
  head/sys/modules/utopia/Makefile
  head/sys/net/if_atm.h
  head/sys/net/if_atmsubr.c
  head/sys/netgraph/atm/ng_atm.c
  head/sys/netgraph/atm/ng_atm.h
  head/sys/netinet/if_atm.c
  head/sys/netinet/if_atm.h
  head/sys/netnatm/natm.c
  head/sys/netnatm/natm.h
  head/sys/netnatm/natm_pcb.c
  head/sys/netnatm/natm_proto.c
  head/usr.sbin/bsnmpd/modules/snmp_atm/BEGEMOT-ATM-FREEBSD-MIB.txt
  head/usr.sbin/bsnmpd/modules/snmp_atm/Makefile
  head/usr.sbin/bsnmpd/modules/snmp_atm/Makefile.depend
  head/usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def
  head/usr.sbin/bsnmpd/modules/snmp_atm/atm_sys.c
  head/usr.sbin/ppp/atm.c
  head/usr.sbin/ppp/atm.h
Modified:
  head/ObsoleteFiles.inc
  head/etc/mtree/BSD.usr.dist
  head/include/Makefile
  head/lib/libc/net/getnameinfo.c
  head/rescue/rescue/Makefile
  head/sbin/Makefile
  head/share/man/man4/Makefile
  head/sys/boot/forth/loader.conf
  head/sys/conf/NOTES
  head/sys/conf/config.mk
  head/sys/conf/files
  head/sys/conf/options
  head/sys/modules/Makefile
  head/sys/modules/netgraph/atm/Makefile
  head/sys/net/netisr.h
  head/sys/netgraph/ng_atmllc.c
  head/sys/sys/param.h
  head/usr.sbin/bsnmpd/modules/Makefile
  head/usr.sbin/ppp/Makefile
  head/usr.sbin/ppp/physical.c

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/ObsoleteFiles.inc	Mon Apr 24 21:21:49 2017	(r317383)
@@ -38,6 +38,44 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170424: NATM support removed
+OLD_FILES+=rescue/atmconfig
+OLD_FILES+=sbin/atmconfig
+OLD_FILES+=usr/include/bsnmp/snmp_atm.h
+OLD_FILES+=usr/include/dev/utopia/idtphy.h
+OLD_FILES+=usr/include/dev/utopia/suni.h
+OLD_FILES+=usr/include/dev/utopia/utopia.h
+OLD_FILES+=usr/include/dev/utopia/utopia_priv.h
+OLD_DIRS+=usr/include/dev/utopia
+OLD_FILES+=usr/include/net/if_atm.h
+OLD_FILES+=usr/include/netgraph/atm/ng_atm.h
+OLD_FILES+=usr/include/netinet/if_atm.h
+OLD_FILES+=usr/include/netnatm/natm.h
+OLD_FILES+=usr/lib/debug/sbin/atmconfig.debug
+OLD_FILES+=usr/lib/debug/usr/lib/snmp_atm.so.6.debug
+OLD_FILES+=usr/lib/snmp_atm.so
+OLD_FILES+=usr/lib/snmp_atm.so.6
+OLD_FILES+=usr/share/doc/atm/atmconfig.help
+OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
+OLD_DIRS+=usr/share/doc/atm
+OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
+OLD_FILES+=usr/share/man/man4/en.4.gz
+OLD_FILES+=usr/share/man/man4/fatm.4.gz
+OLD_FILES+=usr/share/man/man4/hatm.4.gz
+OLD_FILES+=usr/share/man/man4/if_en.4.gz
+OLD_FILES+=usr/share/man/man4/if_fatm.4.gz
+OLD_FILES+=usr/share/man/man4/if_hatm.4.gz
+OLD_FILES+=usr/share/man/man4/if_patm.4.gz
+OLD_FILES+=usr/share/man/man4/natm.4.gz
+OLD_FILES+=usr/share/man/man4/natmip.4.gz
+OLD_FILES+=usr/share/man/man4/ng_atm.4.gz
+OLD_FILES+=usr/share/man/man4/patm.4.gz
+OLD_FILES+=usr/share/man/man4/utopia.4.gz
+OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
+OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
+OLD_FILES+=usr/share/snmp/defs/atm_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 # 20170420: remove GNU diff
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme

Modified: head/etc/mtree/BSD.usr.dist
==============================================================================
--- head/etc/mtree/BSD.usr.dist	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/etc/mtree/BSD.usr.dist	Mon Apr 24 21:21:49 2017	(r317383)
@@ -189,8 +189,6 @@
             ..
             atf
             ..
-            atm
-            ..
             legal
             ..
             llvm

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/include/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -40,14 +40,14 @@ LHDRS=	aio.h errno.h fcntl.h linker_set.
 	syslog.h ucontext.h
 
 LDIRS=	bsm cam geom net net80211 netgraph netinet netinet6 \
-	netipsec netnatm netsmb nfs nfsclient nfsserver sys vm
+	netipsec netsmb nfs nfsclient nfsserver sys vm
 
 LSUBDIRS=	cam/ata cam/nvme cam/scsi \
 	dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \
 	dev/hwpmc dev/hyperv \
 	dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/mmc dev/nvme \
 	dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \
-	dev/speaker dev/utopia dev/vkbd dev/wi \
+	dev/speaker dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
 	fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \

Modified: head/lib/libc/net/getnameinfo.c
==============================================================================
--- head/lib/libc/net/getnameinfo.c	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/lib/libc/net/getnameinfo.c	Mon Apr 24 21:21:49 2017	(r317383)
@@ -455,7 +455,6 @@ getnameinfo_link(const struct afd *afd,
 		    host, hostlen);
 	/*
 	 * The following have zero-length addresses.
-	 * IFT_ATM	(net/if_atmsubr.c)
 	 * IFT_GIF	(net/if_gif.c)
 	 * IFT_LOOP	(net/if_loop.c)
 	 * IFT_PPP	(net/if_ppp.c, net/if_spppsubr.c)

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/rescue/rescue/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -101,10 +101,6 @@ CRUNCH_PROGS_sbin= badsect					\
 	restore rcorder route savecore		 		\
 	shutdown spppcontrol swapon sysctl tunefs umount
 
-.if ${MK_ATM} != "no"
-CRUNCH_PROGS_sbin+= atmconfig
-.endif
-
 .if ${MK_CCD} != "no"
 CRUNCH_PROGS_sbin+= ccdconfig
 .endif

Modified: head/sbin/Makefile
==============================================================================
--- head/sbin/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sbin/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -70,7 +70,6 @@ SUBDIR=adjkerntz \
 	tunefs \
 	umount
 
-SUBDIR.${MK_ATM}+=	atm
 SUBDIR.${MK_CCD}+=	ccdconfig
 SUBDIR.${MK_CXX}+=	devd
 SUBDIR.${MK_HAST}+=	hastctl

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/share/man/man4/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -144,7 +144,6 @@ MAN=	aac.4 \
 	edsc.4 \
 	ehci.4 \
 	em.4 \
-	en.4 \
 	enc.4 \
 	epair.4 \
 	esp.4 \
@@ -153,7 +152,6 @@ MAN=	aac.4 \
 	etherswitch.4 \
 	eventtimers.4 \
 	exca.4 \
-	fatm.4 \
 	fd.4 \
 	fdc.4 \
 	fdt.4 \
@@ -181,7 +179,6 @@ MAN=	aac.4 \
 	gpioled.4 \
 	gre.4 \
 	h_ertt.4 \
-	hatm.4 \
 	hifn.4 \
 	hme.4 \
 	hpet.4 \
@@ -307,8 +304,6 @@ MAN=	aac.4 \
 	my.4 \
 	nand.4 \
 	nandsim.4 \
-	natm.4 \
-	natmip.4 \
 	ncr.4 \
 	ncv.4 \
 	${_ndis.4} \
@@ -320,7 +315,6 @@ MAN=	aac.4 \
 	${_nfe.4} \
 	${_nfsmb.4} \
 	ng_async.4 \
-	ng_atm.4 \
 	ngatmbase.4 \
 	ng_atmllc.4 \
 	ng_bpf.4 \
@@ -397,7 +391,6 @@ MAN=	aac.4 \
 	owc.4 \
 	${_padlock.4} \
 	pass.4 \
-	patm.4 \
 	pccard.4 \
 	pccbb.4 \
 	pcf.4 \
@@ -627,11 +620,9 @@ MLINKS+=disc.4 if_disc.4
 MLINKS+=ed.4 if_ed.4
 MLINKS+=edsc.4 if_edsc.4
 MLINKS+=em.4 if_em.4
-MLINKS+=en.4 if_en.4
 MLINKS+=enc.4 if_enc.4
 MLINKS+=epair.4 if_epair.4
 MLINKS+=et.4 if_et.4
-MLINKS+=fatm.4 if_fatm.4
 MLINKS+=fd.4 stderr.4 \
 	fd.4 stdin.4 \
 	fd.4 stdout.4
@@ -645,7 +636,6 @@ MLINKS+=geom.4 GEOM.4
 MLINKS+=gif.4 if_gif.4
 MLINKS+=gpio.4 gpiobus.4
 MLINKS+=gre.4 if_gre.4
-MLINKS+=hatm.4 if_hatm.4
 MLINKS+=hme.4 if_hme.4
 MLINKS+=hpet.4 acpi_hpet.4
 MLINKS+=${_hptrr.4} ${_rr232x.4}
@@ -695,7 +685,6 @@ MLINKS+=nge.4 if_nge.4
 MLINKS+=${_ntb_hw.4} ${_ntb.4}
 MLINKS+=${_nxge.4} ${_if_nxge.4}
 MLINKS+=ow.4 onewire.4
-MLINKS+=patm.4 if_patm.4
 MLINKS+=pccbb.4 cbb.4
 MLINKS+=pcm.4 snd.4 \
 	pcm.4 sound.4
@@ -966,7 +955,6 @@ MAN+=	\
 	usb_template.4 \
 	usfs.4 \
 	uslcom.4 \
-	utopia.4 \
 	uvisor.4 \
 	uvscom.4 \
 	zyd.4

Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/boot/forth/loader.conf	Mon Apr 24 21:21:49 2017	(r317383)
@@ -327,16 +327,13 @@ if_de_load="NO"			# DEC DC21x4x Ethernet
 if_ed_load="NO"			# National Semiconductor DS8390/WD83C690
 				# Ethernet
 if_em_load="NO"			# Intel(R) PRO/1000 Gigabit Ethernet
-if_en_load="NO"			# Midway-based ATM interfaces
 if_ep_load="NO"			# 3Com Etherlink III (3c5x9)
 if_et_load="NO"			# Agere ET1310 10/100/Gigabit Ethernet
 if_ex_load="NO"			# Intel EtherExpress Pro/10 Ethernet
-if_fatm_load="NO"		# Fore PCA200E ATM
 if_fe_load="NO"			# Fujitsu MB86960A/MB86965A based Ethernet
 				# adapters
 if_fxp_load="NO"		# Intel EtherExpress PRO/100B (82557, 82558)
 if_gem_load="NO"		# Sun GEM/Sun ERI/Apple GMAC
-if_hatm_load="NO"		# Fore/Marconi HE155 and HE622
 if_hme_load="NO"		# Sun Microelectronics STP2002-STQ Ethernet
 if_ie_load="NO"			# Intel 82586
 if_ipw_load="NO"		# Intel PRO/Wireless 2100 wireless
@@ -360,7 +357,6 @@ if_my_load="NO"			# Myson PCI Fast Ether
 if_nfe_load="NO"		# NVIDIA nForce MCP Networking Adapter
 if_nge_load="NO"		# National Semiconductor PCI Gigabit Ethernet
 if_nxge_load="NO"		# Neterion Xframe 10Gb Ethernet
-if_patm_load="NO"		# IDT77252 ATM
 if_pcn_load="NO"		# AMD PCnet PCI
 if_ral_load="NO"		# Ralink Technology wireless
 if_re_load="NO"			# RealTek 8139C+/8169/8169S/8110S
@@ -395,7 +391,6 @@ if_wpi_load="NO"		# Intel 3945ABG Wirele
 if_xe_load="NO"			# Xircom CreditCard PCMCIA
 if_xl_load="NO"			# 3Com Etherlink XL (3c900, 3c905, 3c905B)
 sfxge_load="NO"			# Solarflare 10Gb Ethernet adapter driver
-utopia_load="NO"		# ATM PHY driver
 
 
 ##############################################################

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/conf/NOTES	Mon Apr 24 21:21:49 2017	(r317383)
@@ -2212,42 +2212,7 @@ device		rtwnfw
 options 	MCLSHIFT=12	# mbuf cluster shift in bits, 12 == 4KB
 options 	MSIZE=512	# mbuf size in bytes
 
-#
-# ATM related options (Cranor version)
-# (note: this driver cannot be used with the HARP ATM stack)
-#
-# The `en' device provides support for Efficient Networks (ENI)
-# ENI-155 PCI midway cards, and the Adaptec 155Mbps PCI ATM cards (ANA-59x0).
-#
-# The `hatm' device provides support for Fore/Marconi HE155 and HE622
-# ATM PCI cards.
-#
-# The `fatm' device provides support for Fore PCA200E ATM PCI cards.
-#
-# The `patm' device provides support for IDT77252 based cards like
-# ProSum's ProATM-155 and ProATM-25 and IDT's evaluation boards.
-#
-# atm device provides generic atm functions and is required for
-# atm devices.
-# NATM enables the netnatm protocol family that can be used to
-# bypass TCP/IP.
-#
-# utopia provides the access to the ATM PHY chips and is required for en,
-# hatm and fatm.
-#
-# the current driver supports only PVC operations (no atm-arp, no multicast).
-# for more details, please read the original documents at
-# http://www.ccrc.wustl.edu/pub/chuck/tech/bsdatm/bsdatm.html
-#
-device		atm
-device		en
-device		fatm			#Fore PCA200E
-device		hatm			#Fore/Marconi HE155/622
-device		patm			#IDT77252 cards (ProATM and IDT)
-device		utopia			#ATM PHY driver
-options 	NATM			#native ATM
-
-options 	LIBMBPOOL		#needed by patm, iatm
+options 	LIBMBPOOL
 
 #
 # Sound drivers

Modified: head/sys/conf/config.mk
==============================================================================
--- head/sys/conf/config.mk	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/conf/config.mk	Mon Apr 24 21:21:49 2017	(r317383)
@@ -25,8 +25,6 @@ opt_ratelimit.h:
 .endif
 opt_mrouting.h:
 	echo "#define MROUTING 1" > ${.TARGET}
-opt_natm.h:
-	echo "#define NATM 1" > ${.TARGET}
 opt_printf.h:
 	echo "#define PRINTF_BUFR_SIZE 128" > ${.TARGET}
 opt_scsi.h:
@@ -38,7 +36,7 @@ opt_wlan.h:
 KERN_OPTS.i386=NEW_PCIB DEV_PCI
 KERN_OPTS.amd64=NEW_PCIB DEV_PCI
 KERN_OPTS.powerpc=NEW_PCIB DEV_PCI
-KERN_OPTS=MROUTING NATM IEEE80211_DEBUG \
+KERN_OPTS=MROUTING IEEE80211_DEBUG \
 	IEEE80211_AMPDU_AGE IEEE80211_SUPPORT_MESH DEV_BPF \
 	${KERN_OPTS.${MACHINE}} ${KERN_OPTS_EXTRA}
 .if ${MK_INET_SUPPORT} != "no"

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/conf/files	Mon Apr 24 21:21:49 2017	(r317383)
@@ -1579,8 +1579,6 @@ dev/e1000/e1000_mbx.c		optional em \
 dev/e1000/e1000_osdep.c		optional em \
 	compile-with "${NORMAL_C} -I$S/dev/e1000"
 dev/et/if_et.c			optional et
-dev/en/if_en_pci.c		optional en pci
-dev/en/midway.c			optional en
 dev/ep/if_ep.c			optional ep
 dev/ep/if_ep_isa.c		optional ep isa
 dev/ep/if_ep_pccard.c		optional ep pccard
@@ -1636,7 +1634,6 @@ dev/extres/regulator/regnode_if.m	option
 dev/extres/regulator/regulator.c	optional ext_resources regulator fdt
 dev/extres/regulator/regulator_bus.c	optional ext_resources regulator fdt
 dev/extres/regulator/regulator_fixed.c	optional ext_resources regulator fdt
-dev/fatm/if_fatm.c		optional fatm pci
 dev/fb/fbd.c			optional fbd | vt
 dev/fb/fb_if.m			standard
 dev/fb/splash.c			optional sc splash
@@ -1688,11 +1685,6 @@ dev/gpio/gpio_if.m		optional gpio
 dev/gpio/gpiobus_if.m		optional gpio
 dev/gpio/gpiopps.c		optional gpiopps
 dev/gpio/ofw_gpiobus.c		optional fdt gpio
-dev/hatm/if_hatm.c		optional hatm pci
-dev/hatm/if_hatm_intr.c		optional hatm pci
-dev/hatm/if_hatm_ioctl.c	optional hatm pci
-dev/hatm/if_hatm_rx.c		optional hatm pci
-dev/hatm/if_hatm_tx.c		optional hatm pci
 dev/hifn/hifn7751.c		optional hifn
 dev/hme/if_hme.c		optional hme
 dev/hme/if_hme_pci.c		optional hme pci
@@ -2374,13 +2366,6 @@ dev/ow/owll_if.m		optional ow
 dev/ow/own_if.m			optional ow
 dev/ow/ow_temp.c		optional ow_temp
 dev/ow/owc_gpiobus.c		optional owc gpio
-dev/patm/if_patm.c		optional patm pci
-dev/patm/if_patm_attach.c	optional patm pci
-dev/patm/if_patm_intr.c		optional patm pci
-dev/patm/if_patm_ioctl.c	optional patm pci
-dev/patm/if_patm_rtables.c	optional patm pci
-dev/patm/if_patm_rx.c		optional patm pci
-dev/patm/if_patm_tx.c		optional patm pci
 dev/pbio/pbio.c			optional pbio isa
 dev/pccard/card_if.m		standard
 dev/pccard/pccard.c		optional pccard
@@ -3202,9 +3187,6 @@ dev/videomode/videomode.c		optional vide
 dev/videomode/edid.c			optional videomode
 dev/videomode/pickmode.c		optional videomode
 dev/videomode/vesagtf.c			optional videomode
-dev/utopia/idtphy.c		optional utopia
-dev/utopia/suni.c		optional utopia
-dev/utopia/utopia.c		optional utopia
 dev/vge/if_vge.c		optional vge
 dev/viapm/viapm.c		optional viapm pci
 dev/virtio/virtio.c			optional	virtio
@@ -3884,7 +3866,6 @@ net/flowtable.c			optional flowtable ine
 net/ieee8023ad_lacp.c		optional lagg
 net/if.c			standard
 net/if_arcsubr.c		optional arcnet
-net/if_atmsubr.c		optional atm
 net/if_bridge.c			optional bridge inet | if_bridge inet
 net/if_clone.c			standard
 net/if_dead.c			standard
@@ -3981,7 +3962,6 @@ net80211/ieee80211_xauth.c	optional wlan
 net80211/ieee80211_alq.c	optional wlan ieee80211_alq
 netgraph/atm/ccatm/ng_ccatm.c	optional ngatm_ccatm \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-netgraph/atm/ng_atm.c		optional ngatm_atm
 netgraph/atm/ngatmbase.c	optional ngatm_atmbase \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 netgraph/atm/sscfu/ng_sscfu.c	optional ngatm_sscfu \
@@ -4063,7 +4043,6 @@ netgraph/ng_vlan.c		optional netgraph_vl
 netinet/accf_data.c		optional accept_filter_data inet
 netinet/accf_dns.c		optional accept_filter_dns inet
 netinet/accf_http.c		optional accept_filter_http inet
-netinet/if_atm.c		optional atm
 netinet/if_ether.c		optional inet ether
 netinet/igmp.c			optional inet
 netinet/in.c			optional inet
@@ -4188,9 +4167,6 @@ netipsec/xform_ipcomp.c		optional ipsec 
 netipsec/xform_tcp.c		optional ipsec inet tcp_signature | \
 	 ipsec inet6 tcp_signature | ipsec_support inet tcp_signature | \
 	 ipsec_support inet6 tcp_signature
-netnatm/natm.c			optional natm
-netnatm/natm_pcb.c		optional natm
-netnatm/natm_proto.c		optional natm
 netpfil/ipfw/dn_aqm_codel.c	optional inet dummynet
 netpfil/ipfw/dn_aqm_pie.c	optional inet dummynet
 netpfil/ipfw/dn_heap.c		optional inet dummynet

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/conf/options	Mon Apr 24 21:21:49 2017	(r317383)
@@ -553,10 +553,6 @@ DRM_DEBUG		opt_drm.h
 TI_SF_BUF_JUMBO		opt_ti.h
 TI_JUMBO_HDRSPLIT	opt_ti.h
 
-# XXX Conflict: # of devices vs network protocol (Native ATM).
-# This makes "atm.h" unusable.
-NATM
-
 # DPT driver debug flags
 DPT_MEASURE_PERFORMANCE	opt_dpt.h
 DPT_RESET_HBA		opt_dpt.h

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/modules/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -107,7 +107,6 @@ SUBDIR=	\
 	${_efirt} \
 	${_elink} \
 	${_em} \
-	en \
 	${_ep} \
 	${_epic} \
 	esp \
@@ -116,7 +115,6 @@ SUBDIR=	\
 	${_ex} \
 	${_exca} \
 	ext2fs \
-	${_fatm} \
 	fdc \
 	fdescfs \
 	${_fe} \
@@ -130,7 +128,6 @@ SUBDIR=	\
 	${_glxiic} \
 	${_glxsb} \
 	gpio \
-	hatm \
 	hifn \
 	hme \
 	${_hpt27xx} \
@@ -289,7 +286,6 @@ SUBDIR=	\
 	ow \
 	${_padlock} \
 	${_padlock_rng} \
-	patm \
 	${_pccard} \
 	${_pcfclock} \
 	pcn \
@@ -380,7 +376,6 @@ SUBDIR=	\
 	uinput \
 	unionfs \
 	usb \
-	utopia \
 	${_vesa} \
 	${_virtio} \
 	vge \
@@ -500,7 +495,6 @@ _pfsync=	pfsync
 
 .if ${MK_SOURCELESS_UCODE} != "no"
 _bce=		bce
-_fatm=		fatm
 _fxp=		fxp
 _ispfw=		ispfw
 _sf=		sf

Modified: head/sys/modules/netgraph/atm/Makefile
==============================================================================
--- head/sys/modules/netgraph/atm/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/modules/netgraph/atm/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 SUBDIR=			\
-	atm 		\
 	atmbase		\
 	ccatm		\
 	sscfu		\

Modified: head/sys/net/netisr.h
==============================================================================
--- head/sys/net/netisr.h	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/net/netisr.h	Mon Apr 24 21:21:49 2017	(r317383)
@@ -55,7 +55,6 @@
 #define	NETISR_ARP	4		/* same as AF_LINK */
 #define	NETISR_ETHER	5		/* ethernet input */
 #define	NETISR_IPV6	6
-#define	NETISR_NATM	7
 #define	NETISR_EPAIR	8		/* if_epair(4) */
 #define	NETISR_IP_DIRECT	9	/* direct-dispatch IPv4 */
 #define	NETISR_IPV6_DIRECT	10	/* direct-dispatch IPv6 */

Modified: head/sys/netgraph/ng_atmllc.c
==============================================================================
--- head/sys/netgraph/ng_atmllc.c	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/netgraph/ng_atmllc.c	Mon Apr 24 21:21:49 2017	(r317383)
@@ -40,7 +40,6 @@
 
 #include <net/if.h>
 #include <net/ethernet.h>	/* for M_HASFCS and ETHER_HDR_LEN */
-#include <net/if_atm.h>		/* for struct atmllc */
 
 #define	NG_ATMLLC_HEADER		"\252\252\3\0\200\302"
 #define	NG_ATMLLC_HEADER_LEN		(sizeof(struct atmllc))
@@ -55,6 +54,18 @@ struct ng_atmllc_priv {
 	hook_p		fddi;
 };
 
+struct atmllc {
+	uint8_t		llchdr[6];	/* aa.aa.03.00.00.00 */
+	uint8_t		type[2];	/* "ethernet" type */
+};
+
+/* ATM_LLC macros: note type code in host byte order */
+#define	ATM_LLC_TYPE(X) (((X)->type[0] << 8) | ((X)->type[1]))
+#define	ATM_LLC_SETTYPE(X, V) do {		\
+	(X)->type[0] = ((V) >> 8) & 0xff;	\
+	(X)->type[1] = ((V) & 0xff);		\
+    } while (0)
+
 /* Netgraph methods. */
 static ng_constructor_t		ng_atmllc_constructor;
 static ng_shutdown_t		ng_atmllc_shutdown;

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/sys/sys/param.h	Mon Apr 24 21:21:49 2017	(r317383)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200029	/* Master, propagated to newvers */
+#define __FreeBSD_version 1200030	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

Modified: head/usr.sbin/bsnmpd/modules/Makefile
==============================================================================
--- head/usr.sbin/bsnmpd/modules/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/usr.sbin/bsnmpd/modules/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -4,11 +4,7 @@
 
 .PATH: ${SRCTOP}/contrib/bsnmp/snmpd
 
-.if ${MK_ATM} != "no"
-_snmp_atm= snmp_atm
-.endif
-
-SUBDIR=	${_snmp_atm} \
+SUBDIR=	\
 	snmp_bridge \
 	snmp_hostres \
 	snmp_lm75 \

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/usr.sbin/ppp/Makefile	Mon Apr 24 21:21:49 2017	(r317383)
@@ -13,7 +13,6 @@ SRCS=	acf.c arp.c async.c auth.c bundle.
 WARNS?=	3
 .if defined(RELEASE_CRUNCH)
 CFLAGS+=-DRELEASE_CRUNCH
-PPP_NO_ATM=
 PPP_NO_DES=
 PPP_NO_KLDLOAD=
 PPP_NO_NAT=
@@ -25,9 +24,6 @@ CONFS=	ppp.conf
 CONFSDIR=	${CONFDIR}/ppp
 CONFSMODE=	600
 
-.if ${MK_ATM} == "no"
-PPP_NO_ATM=
-.endif
 .if ${MK_NETGRAPH} == "no"
 PPP_NO_NETGRAPH=
 .endif
@@ -68,12 +64,6 @@ SRCS+=	nat_cmd.c
 LIBADD+=	alias
 .endif
 
-.if defined(PPP_NO_ATM)
-CFLAGS+=-DNOATM
-.else
-SRCS+=	atm.c
-.endif
-
 .if defined(PPP_NO_SUID)
 CFLAGS+=-DNOSUID
 .else

Modified: head/usr.sbin/ppp/physical.c
==============================================================================
--- head/usr.sbin/ppp/physical.c	Mon Apr 24 20:46:19 2017	(r317382)
+++ head/usr.sbin/ppp/physical.c	Mon Apr 24 21:21:49 2017	(r317383)
@@ -102,9 +102,6 @@
 #include "ether.h"
 #include "netgraph.h"
 #endif
-#ifndef NOATM
-#include "atm.h"
-#endif
 #include "tcpmss.h"
 
 static int physical_DescriptorWrite(struct fdescriptor *, struct bundle *,
@@ -133,10 +130,6 @@ struct {
   { ng_Create, ng_iov2device, ng_DeviceSize },
 #endif
 #endif
-#ifndef NOATM
-  /* Ditto for ATM devices */
-  { atm_Create, atm_iov2device, atm_DeviceSize },
-#endif
   { tcp_Create, tcp_iov2device, tcp_DeviceSize },
   { udp_Create, udp_iov2device, udp_DeviceSize },
   { exec_Create, exec_iov2device, exec_DeviceSize }


More information about the svn-src-head mailing list