Author: brueffer
Date: Sun Feb 16 12:22:43 2014
New Revision: 261975
URL: http://svnweb.freebsd.org/changeset/base/261975

Log:
  Retire the nve(4) driver; nfe(4) has been the default driver for NVIDIA
  nForce MCP adapters for a long time.
  
  Yays: jhb, remko, yongari
  Nays: none on the current and stable lists

Deleted:
  head/share/man/man4/nve.4
  head/sys/contrib/dev/nve/
  head/sys/dev/nve/
  head/sys/modules/nve/
Modified:
  head/release/doc/en_US.ISO8859-1/hardware/article.xml
  head/release/doc/share/misc/dev.archlist.txt
  head/share/man/man4/Makefile
  head/share/man/man4/altq.4
  head/share/man/man4/miibus.4
  head/share/man/man4/vlan.4
  head/sys/amd64/conf/GENERIC
  head/sys/amd64/conf/NOTES
  head/sys/boot/forth/loader.conf
  head/sys/conf/WITHOUT_SOURCELESS_HOST
  head/sys/conf/files.amd64
  head/sys/conf/files.i386
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES
  head/sys/i386/conf/PAE
  head/sys/i386/conf/XEN
  head/sys/mips/conf/OCTEON1
  head/sys/modules/Makefile

Modified: head/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/hardware/article.xml       Sun Feb 16 
11:17:40 2014        (r261974)
+++ head/release/doc/en_US.ISO8859-1/hardware/article.xml       Sun Feb 16 
12:22:43 2014        (r261975)
@@ -883,8 +883,6 @@
 
       &hwlist.nge;
 
-      &hwlist.nve;
-
       &hwlist.nxge;
 
       &hwlist.oce;

Modified: head/release/doc/share/misc/dev.archlist.txt
==============================================================================
--- head/release/doc/share/misc/dev.archlist.txt        Sun Feb 16 11:17:40 
2014        (r261974)
+++ head/release/doc/share/misc/dev.archlist.txt        Sun Feb 16 12:22:43 
2014        (r261975)
@@ -97,7 +97,6 @@ nfe   i386,amd64
 ng_bt3c        i386,pc98,amd64
 ng_ubt i386,pc98,amd64
 nsp    i386,pc98
-nve    i386,amd64
 nxge   i386,amd64
 oce    i386,amd64
 ohci   i386,pc98,ia64,amd64,powerpc

Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile        Sun Feb 16 11:17:40 2014        
(r261974)
+++ head/share/man/man4/Makefile        Sun Feb 16 12:22:43 2014        
(r261975)
@@ -344,7 +344,6 @@ MAN=        aac.4 \
        ${_ntb.4} \
        null.4 \
        ${_nvd.4} \
-       ${_nve.4} \
        ${_nvme.4} \
        ${_nvram.4} \
        ${_nvram2env.4} \
@@ -673,7 +672,6 @@ MLINKS+=${_nfe.4} ${_if_nfe.4}
 MLINKS+=nge.4 if_nge.4
 MLINKS+=${_ntb.4} ${_if_ntb.4} \
        ${_ntb.4} ${_ntb_hw.4}
-MLINKS+=${_nve.4} ${_if_nve.4}
 MLINKS+=${_nxge.4} ${_if_nxge.4}
 MLINKS+=patm.4 if_patm.4
 MLINKS+=pccbb.4 cbb.4
@@ -772,7 +770,6 @@ _ichwd.4=   ichwd.4
 _if_bxe.4=     if_bxe.4
 _if_ndis.4=    if_ndis.4
 _if_nfe.4=     if_nfe.4
-_if_nve.4=     if_nve.4
 _if_nxge.4=    if_nxge.4
 _if_urtw.4=    if_urtw.4
 _if_vmx.4=     if_vmx.4
@@ -787,7 +784,6 @@ _ndis.4=    ndis.4
 _nfe.4=                nfe.4
 _nfsmb.4=      nfsmb.4
 _nvd.4=                nvd.4
-_nve.4=                nve.4
 _nvme.4=       nvme.4
 _nvram.4=      nvram.4
 _nxge.4=       nxge.4

Modified: head/share/man/man4/altq.4
==============================================================================
--- head/share/man/man4/altq.4  Sun Feb 16 11:17:40 2014        (r261974)
+++ head/share/man/man4/altq.4  Sun Feb 16 12:22:43 2014        (r261975)
@@ -151,7 +151,6 @@ They have been applied to the following 
 .Xr nfe 4 ,
 .Xr nge 4 ,
 .Xr npe 4 ,
-.Xr nve 4 ,
 .Xr qlxgb 4 ,
 .Xr ral 4 ,
 .Xr re 4 ,

Modified: head/share/man/man4/miibus.4
==============================================================================
--- head/share/man/man4/miibus.4        Sun Feb 16 11:17:40 2014        
(r261974)
+++ head/share/man/man4/miibus.4        Sun Feb 16 12:22:43 2014        
(r261975)
@@ -87,8 +87,6 @@ Marvell/SysKonnect Yukon II Gigabit Ethe
 NVIDIA nForce MCP Networking Adapter
 .It Xr nge 4
 National Semiconductor DP83820/DP83821 Gigabit Ethernet
-.It Xr nve 4
-NVIDIA nForce MCP Networking Adapter
 .It Xr pcn 4
 AMD Am79C97x PCI 10/100
 .It Xr re 4
@@ -159,7 +157,6 @@ but as a result are not well behaved new
 .Xr netintro 4 ,
 .Xr nfe 4 ,
 .Xr nge 4 ,
-.Xr nve 4 ,
 .Xr pcn 4 ,
 .Xr re 4 ,
 .Xr rgephy 4 ,

Modified: head/share/man/man4/vlan.4
==============================================================================
--- head/share/man/man4/vlan.4  Sun Feb 16 11:17:40 2014        (r261974)
+++ head/share/man/man4/vlan.4  Sun Feb 16 12:22:43 2014        (r261975)
@@ -176,7 +176,6 @@ These interfaces natively support long f
 .Xr hme 4 ,
 .Xr le 4 ,
 .Xr nfe 4 ,
-.Xr nve 4 ,
 .Xr rl 4 ,
 .Xr sf 4 ,
 .Xr sis 4 ,

Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/amd64/conf/GENERIC Sun Feb 16 12:22:43 2014        (r261975)
@@ -235,7 +235,6 @@ device              lge             # Level 1 LXT1001 
gigabit E
 device         msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
 device         nfe             # nVidia nForce MCP on-board Ethernet
 device         nge             # NatSemi DP83820 gigabit Ethernet
-#device                nve             # nVidia nForce MCP on-board Ethernet 
Networking
 device         pcn             # AMD Am79C97x PCI 10/100 (precedence over 'le')
 device         re              # RealTek 8139C+/8169/8169S/8110S
 device         rl              # RealTek 8129/8139

Modified: head/sys/amd64/conf/NOTES
==============================================================================
--- head/sys/amd64/conf/NOTES   Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/amd64/conf/NOTES   Sun Feb 16 12:22:43 2014        (r261975)
@@ -309,7 +309,6 @@ options     DRM_DEBUG       # Include debug print
 # mlxen: Mellanox ConnectX HCA Ethernet
 # mthca: Mellanox HCA InfiniBand
 # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
-# nve: nVidia nForce MCP on-board Ethernet Networking
 # sfxge: Solarflare SFC9000 family 10Gb Ethernet adapters
 # vmx: VMware VMXNET3 Ethernet (BSD open source)
 # wpi: Intel 3945ABG Wireless LAN controller
@@ -327,7 +326,6 @@ device      mlx4ib          # Mellanox ConnectX HCA
 device         mlxen           # Mellanox ConnectX HCA Ethernet
 device         mthca           # Mellanox HCA InfiniBand
 device         nfe             # nVidia nForce MCP on-board Ethernet
-device         nve             # nVidia nForce MCP on-board Ethernet Networking
 device         sfxge           # Solarflare SFC9000 10Gb Ethernet
 device         vmx             # VMware VMXNET3 Ethernet
 device         wpi             # Intel 3945ABG wireless NICs.

Modified: head/sys/boot/forth/loader.conf
==============================================================================
--- head/sys/boot/forth/loader.conf     Sun Feb 16 11:17:40 2014        
(r261974)
+++ head/sys/boot/forth/loader.conf     Sun Feb 16 12:22:43 2014        
(r261975)
@@ -327,7 +327,6 @@ if_mxge_load="NO"           # Myricom Myri10GE 10
 if_my_load="NO"                        # Myson PCI Fast Ethernet
 if_nfe_load="NO"               # NVIDIA nForce MCP Networking Adapter
 if_nge_load="NO"               # National Semiconductor PCI Gigabit Ethernet
-if_nve_load="NO"               # NVIDIA nForce MCP Networking Adapter
 if_nxge_load="NO"              # Neterion Xframe 10Gb Ethernet
 if_patm_load="NO"              # IDT77252 ATM
 if_pcn_load="NO"               # AMD PCnet PCI

Modified: head/sys/conf/WITHOUT_SOURCELESS_HOST
==============================================================================
--- head/sys/conf/WITHOUT_SOURCELESS_HOST       Sun Feb 16 11:17:40 2014        
(r261974)
+++ head/sys/conf/WITHOUT_SOURCELESS_HOST       Sun Feb 16 12:22:43 2014        
(r261975)
@@ -8,4 +8,3 @@ nodevice        hpt27xx
 nodevice       hptmv
 nodevice       hptnr
 nodevice       hptrr
-nodevice       nve

Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64   Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/conf/files.amd64   Sun Feb 16 12:22:43 2014        (r261975)
@@ -47,17 +47,6 @@ ukbdmap.h                    optional        
ukbd_dflt_keymap        \
        no-obj no-implicit-rule before-depend                           \
        clean           "ukbdmap.h"
 #
-nvenetlib.o                    optional        nve pci                 \
-       dependency      "$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu"   \
-       compile-with    "uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; 
bzip2 -df nvenetlib.o.bz2" \
-       no-implicit-rule
-#
-os+%DIKED-nve.h                optional        nve pci                 \
-       dependency      "$S/contrib/dev/nve/os.h"                       \
-       compile-with    "sed -e 's/^.*#include.*phy\.h.*$$//' 
$S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
-       no-implicit-rule no-obj before-depend                           \
-       clean           "os+%DIKED-nve.h"
-#
 hpt27xx_lib.o                  optional        hpt27xx                 \
        dependency      "$S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu"     \
        compile-with    "uudecode < $S/dev/hpt27xx/amd64-elf.hpt27xx_lib.o.uu" \
@@ -248,7 +237,6 @@ dev/nfe/if_nfe.c            optional        nfe pci
 dev/ntb/if_ntb/if_ntb.c                optional        if_ntb
 dev/ntb/ntb_hw/ntb_hw.c                optional        if_ntb ntb_hw
 dev/nvd/nvd.c                  optional        nvd nvme
-dev/nve/if_nve.c               optional        nve pci
 dev/nvme/nvme.c                        optional        nvme
 dev/nvme/nvme_ctrlr.c          optional        nvme
 dev/nvme/nvme_ctrlr_cmd.c      optional        nvme

Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386    Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/conf/files.i386    Sun Feb 16 12:22:43 2014        (r261975)
@@ -46,17 +46,6 @@ ukbdmap.h                    optional        
ukbd_dflt_keymap        \
        no-obj no-implicit-rule before-depend                           \
        clean           "ukbdmap.h"
 #
-nvenetlib.o                    optional        nve pci                 \
-       dependency      "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu"    \
-       compile-with    "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; 
bzip2 -df nvenetlib.o.bz2" \
-       no-implicit-rule
-#
-os+%DIKED-nve.h                optional        nve pci                         
\
-       dependency      "$S/contrib/dev/nve/os.h"                       \
-       compile-with    "sed -e 's/^.*#include.*phy\.h.*$$//' 
$S/contrib/dev/nve/os.h > os+%DIKED-nve.h" \
-       no-implicit-rule no-obj before-depend                           \
-       clean           "os+%DIKED-nve.h"
-#
 hpt27xx_lib.o                  optional        hpt27xx                 \
        dependency      "$S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu"      \
        compile-with    "uudecode < $S/dev/hpt27xx/i386-elf.hpt27xx_lib.o.uu" \
@@ -257,7 +246,6 @@ dev/mse/mse.c                       optional mse
 dev/mse/mse_isa.c              optional mse isa
 dev/nfe/if_nfe.c               optional nfe pci
 dev/nvd/nvd.c                  optional nvd nvme
-dev/nve/if_nve.c               optional nve pci
 dev/nvme/nvme.c                        optional nvme
 dev/nvme/nvme_ctrlr.c          optional nvme
 dev/nvme/nvme_ctrlr_cmd.c      optional nvme

Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC  Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/i386/conf/GENERIC  Sun Feb 16 12:22:43 2014        (r261975)
@@ -245,7 +245,6 @@ device              lge             # Level 1 LXT1001 
gigabit E
 device         msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
 device         nfe             # nVidia nForce MCP on-board Ethernet
 device         nge             # NatSemi DP83820 gigabit Ethernet
-#device                nve             # nVidia nForce MCP on-board Ethernet 
Networking
 device         pcn             # AMD Am79C97x PCI 10/100 (precedence over 'le')
 device         re              # RealTek 8139C+/8169/8169S/8110S
 device         rl              # RealTek 8129/8139

Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES    Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/i386/conf/NOTES    Sun Feb 16 12:22:43 2014        (r261975)
@@ -581,7 +581,6 @@ hint.mse.0.irq="5"
 # mlxen: Mellanox ConnectX HCA Ethernet
 # mthca: Mellanox HCA InfiniBand
 # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source)
-# nve: nVidia nForce MCP on-board Ethernet Networking
 # sbni: Granch SBNI12-xx ISA and PCI adapters
 # vmx: VMware VMXNET3 Ethernet (BSD open source)
 # wl:   Lucent Wavelan (ISA card only).
@@ -628,7 +627,6 @@ device      mlx4ib          # Mellanox ConnectX HCA
 device         mlxen           # Mellanox ConnectX HCA Ethernet
 device         mthca           # Mellanox HCA InfiniBand
 device         nfe             # nVidia nForce MCP on-board Ethernet
-device         nve             # nVidia nForce MCP on-board Ethernet Networking
 device         sbni
 hint.sbni.0.at="isa"
 hint.sbni.0.port="0x210"

Modified: head/sys/i386/conf/PAE
==============================================================================
--- head/sys/i386/conf/PAE      Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/i386/conf/PAE      Sun Feb 16 12:22:43 2014        (r261975)
@@ -54,7 +54,6 @@ nodevice      agp
 nodevice       txp
 nodevice       vx
 
-nodevice       nve
 nodevice       pcn
 nodevice       sf
 nodevice       sis

Modified: head/sys/i386/conf/XEN
==============================================================================
--- head/sys/i386/conf/XEN      Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/i386/conf/XEN      Sun Feb 16 12:22:43 2014        (r261975)
@@ -7,7 +7,7 @@ cpu             I686_CPU
 ident          XEN
 
 makeoptions    DEBUG=-g                # Build kernel with gdb(1) debug symbols
-makeoptions    WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv 
ida malo mps mwl nve rdma sound sym trm xfs"
+makeoptions    WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv 
ida malo mps mwl rdma sound sym trm xfs"
 
 options        SCHED_ULE               # ULE scheduler
 options        PREEMPTION              # Enable kernel thread preemption

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1  Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/mips/conf/OCTEON1  Sun Feb 16 12:22:43 2014        (r261975)
@@ -218,7 +218,6 @@ device              jme             # JMicron JMC250 
Gigabit/JM
 device         lge             # Level 1 LXT1001 gigabit Ethernet
 device         msk             # Marvell/SysKonnect Yukon II Gigabit Ethernet
 device         nge             # NatSemi DP83820 gigabit Ethernet
-#device                nve             # nVidia nForce MCP on-board Ethernet 
Networking
 device         pcn             # AMD Am79C97x PCI 10/100 (precedence over 'le')
 device         re              # RealTek 8139C+/8169/8169S/8110S
 device         rl              # RealTek 8129/8139

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile   Sun Feb 16 11:17:40 2014        (r261974)
+++ head/sys/modules/Makefile   Sun Feb 16 12:22:43 2014        (r261975)
@@ -251,7 +251,6 @@ SUBDIR=     \
        nullfs \
        ${_ntb} \
        ${_nvd} \
-       ${_nve} \
        ${_nvme} \
        ${_nvram} \
        ${_nxge} \
@@ -609,9 +608,6 @@ _ixgbe=             ixgbe
 _mly=          mly
 _nfe=          nfe
 _nvd=          nvd
-.if ${MK_SOURCELESS_HOST} != "no"
-_nve=          nve
-.endif
 _nvme=         nvme
 _nvram=                nvram
 _nxge=         nxge
@@ -730,9 +726,6 @@ _ndis=              ndis
 _nfe=          nfe
 _ntb=          ntb
 _nvd=          nvd
-.if ${MK_SOURCELESS_HOST} != "no"
-_nve=          nve
-.endif
 _nvme=         nvme
 _nvram=                nvram
 _nxge=         nxge
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to