svn commit: r347923 - in head: . share/man/man4 sys/conf sys/dev/xe sys/i386/conf sys/modules sys/modules/xe

[Brooks Davis]

Author: brooks
Date: Fri May 17 15:24:44 2019
New Revision: 347923
URL: https://svnweb.freebsd.org/changeset/base/347923

Log:
  FCP-101: Remove xe(4)
  
  Relnotes:	yes
  FCP:		https://github.com/freebsd/fcp/blob/master/fcp-0101.md
  Reviewed by:	jhb, imp
  Differential Revision:	https://reviews.freebsd.org/D20230

Deleted:
  head/share/man/man4/xe.4
  head/sys/dev/xe/
  head/sys/modules/xe/
Modified:
  head/ObsoleteFiles.inc
  head/share/man/man4/Makefile
  head/sys/conf/NOTES
  head/sys/conf/files
  head/sys/i386/conf/GENERIC
  head/sys/modules/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri May 17 15:24:34 2019	(r347922)
+++ head/ObsoleteFiles.inc	Fri May 17 15:24:44 2019	(r347923)
@@ -62,6 +62,8 @@ OLD_FILES+=usr/share/man/man4/txp.4
 OLD_FILES+=usr/share/man/man4/if_txp.4
 OLD_FILES+=usr/share/man/man4/vx.4
 OLD_FILES+=usr/share/man/man4/wb.4
+OLD_FILES+=usr/share/man/man4/xe.4
+OLD_FILES+=usr/share/man/man4/if_xe.4
 # 20190513: libcap_sysctl interface change
 OLD_FILES+=lib/casper/libcap_sysctl.1
 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package.

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile	Fri May 17 15:24:34 2019	(r347922)
+++ head/share/man/man4/Makefile	Fri May 17 15:24:44 2019	(r347923)
@@ -563,7 +563,6 @@ MAN=	aac.4 \
 	wmt.4 \
 	${_wpi.4} \
 	wsp.4 \
-	xe.4 \
 	${_xen.4} \
 	xhci.4 \
 	xl.4 \
@@ -726,7 +725,6 @@ MLINKS+=${_vtnet.4} ${_if_vtnet.4}
 MLINKS+=watchdog.4 SW_WATCHDOG.4
 MLINKS+=wi.4 if_wi.4
 MLINKS+=${_wpi.4} ${_if_wpi.4}
-MLINKS+=xe.4 if_xe.4
 MLINKS+=xl.4 if_xl.4
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"

Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES	Fri May 17 15:24:34 2019	(r347922)
+++ head/sys/conf/NOTES	Fri May 17 15:24:44 2019	(r347923)
@@ -2003,9 +2003,6 @@ device		xmphy		# XaQti XMAC II
 # wi:   Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both
 #       the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA
 #       bridge with a PCMCIA adapter plugged into it.
-# xe:   Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller,
-#       Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card,
-#       Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56
 # xl:   Support for the 3Com 3c900, 3c905, 3c905B and 3c905C (Fast)
 #       Etherlink XL cards and integrated controllers.  This includes the
 #       integrated 3c905B-TX chips in certain Dell Optiplex and Dell
@@ -2017,7 +2014,6 @@ device		xmphy		# XaQti XMAC II
 
 device		an
 device		wi
-device		xe
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		ae		# Attansic/Atheros L2 FastEthernet

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Fri May 17 15:24:34 2019	(r347922)
+++ head/sys/conf/files	Fri May 17 15:24:44 2019	(r347923)
@@ -3432,8 +3432,6 @@ dev/xdma/xdma_mbuf.c		optional xdma
 dev/xdma/xdma_queue.c		optional xdma
 dev/xdma/xdma_sg.c		optional xdma
 dev/xdma/xdma_sglist.c		optional xdma
-dev/xe/if_xe.c			optional xe
-dev/xe/if_xe_pccard.c		optional xe pccard
 dev/xen/balloon/balloon.c	optional xenhvm
 dev/xen/blkfront/blkfront.c	optional xenhvm
 dev/xen/blkback/blkback.c	optional xenhvm

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC	Fri May 17 15:24:34 2019	(r347922)
+++ head/sys/i386/conf/GENERIC	Fri May 17 15:24:44 2019	(r347923)
@@ -264,7 +264,6 @@ device		vte			# DM&P Vortex86 RDC R6040 Fast Ethernet
 device		xl			# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.  pccard NICs included.
-device		xe			# Xircom pccard Ethernet
 
 # Wireless NIC cards
 device		wlan			# 802.11 support

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Fri May 17 15:24:34 2019	(r347922)
+++ head/sys/modules/Makefile	Fri May 17 15:24:44 2019	(r347923)
@@ -387,7 +387,6 @@ SUBDIR=	\
 	${_wpi} \
 	${_wpifw} \
 	${_x86bios} \
-	${_xe} \
 	xl \
 	xz \
 	zlib
@@ -610,7 +609,6 @@ _sppp=		sppp
 _vmware=	vmware
 _wbwd=		wbwd
 _wi=		wi
-_xe=		xe
 
 _aac=		aac
 _aacraid=	aacraid