svn commit: r368559 - in head: . share/man/man4 sys/amd64/conf sys/conf sys/dev/hme sys/dev/sk sys/i386/conf sys/modules sys/modules/hme sys/netpfil/pf
Brooks Davis
brooks at FreeBSD.org
Fri Dec 11 21:40:41 UTC 2020
Author: brooks
Date: Fri Dec 11 21:40:38 2020
New Revision: 368559
URL: https://svnweb.freebsd.org/changeset/base/368559
Log:
hme(4): Remove as previous announced
The hme (Happy Meal Ethernet) driver was the onboard NIC in most
supported sparc64 platforms. A few PCI NICs do exist, but we have seen
no evidence of use on non-sparc systems.
Reviewed by: imp, emaste, bcr
Sponsored by: DARPA
Deleted:
head/share/man/man4/hme.4
head/sys/dev/hme/if_hme.c
head/sys/dev/hme/if_hme_pci.c
head/sys/dev/hme/if_hmereg.h
head/sys/dev/hme/if_hmevar.h
head/sys/modules/hme/Makefile
Modified:
head/ObsoleteFiles.inc
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/conf/NOTES
head/sys/conf/files
head/sys/dev/sk/if_sk.c
head/sys/i386/conf/GENERIC
head/sys/modules/Makefile
head/sys/netpfil/pf/pf.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Fri Dec 11 20:01:45 2020 (r368558)
+++ head/ObsoleteFiles.inc Fri Dec 11 21:40:38 2020 (r368559)
@@ -36,6 +36,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20201211: hme(4) removed
+OLD_FILES+=usr/share/man/man4/hme.4.gz
+OLD_FILES+=usr/share/man/man4/if_hme.4.gz
# 20201124: ping6(8) was merged into ping(8)
OLD_FILES+=usr/lib/debug/sbin/ping6.debug
OLD_FILES+=usr/share/man/man8/ping6.8.gz
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Fri Dec 11 20:01:45 2020 (r368558)
+++ head/share/man/man4/Makefile Fri Dec 11 21:40:38 2020 (r368559)
@@ -180,7 +180,6 @@ MAN= aac.4 \
gre.4 \
h_ertt.4 \
hifn.4 \
- hme.4 \
hpet.4 \
${_hpt27xx.4} \
${_hptiop.4} \
@@ -665,7 +664,6 @@ MLINKS+=gpio.4 gpiobus.4
MLINKS+=gpioths.4 dht11.4
MLINKS+=gpioths.4 dht22.4
MLINKS+=gre.4 if_gre.4
-MLINKS+=hme.4 if_hme.4
MLINKS+=hpet.4 acpi_hpet.4
MLINKS+=${_hptrr.4} ${_rr232x.4}
MLINKS+=${_attimer.4} ${_i8254.4}
Modified: head/share/man/man4/altq.4
==============================================================================
--- head/share/man/man4/altq.4 Fri Dec 11 20:01:45 2020 (r368558)
+++ head/share/man/man4/altq.4 Fri Dec 11 21:40:38 2020 (r368559)
@@ -148,7 +148,6 @@ They have been applied to the following hardware drive
.Xr et 4 ,
.Xr fxp 4 ,
.Xr gem 4 ,
-.Xr hme 4 ,
.Xr igb 4 ,
.Xr ixgbe 4 ,
.Xr jme 4 ,
Modified: head/share/man/man4/miibus.4
==============================================================================
--- head/share/man/man4/miibus.4 Fri Dec 11 20:01:45 2020 (r368558)
+++ head/share/man/man4/miibus.4 Fri Dec 11 21:40:38 2020 (r368559)
@@ -77,8 +77,6 @@ Agere ET1310 Gigabit Ethernet
Intel EtherExpress PRO/100B
.It Xr gem 4
Sun ERI, Sun GEM and Apple GMAC Ethernet
-.It Xr hme 4
-Sun HME Ethernet
.It Xr jme 4
JMicron JMC250 Gigabit/JMC260 Fast Ethernet
.It Xr lge 4
@@ -157,7 +155,6 @@ but as a result are not well behaved newbus device dri
.Xr et 4 ,
.Xr fxp 4 ,
.Xr gem 4 ,
-.Xr hme 4 ,
.Xr jme 4 ,
.Xr lge 4 ,
.Xr msk 4 ,
Modified: head/share/man/man4/vlan.4
==============================================================================
--- head/share/man/man4/vlan.4 Fri Dec 11 20:01:45 2020 (r368558)
+++ head/share/man/man4/vlan.4 Fri Dec 11 21:40:38 2020 (r368559)
@@ -172,7 +172,6 @@ These interfaces natively support long frames for
.Xr fwe 4 ,
.Xr fxp 4 ,
.Xr gem 4 ,
-.Xr hme 4 ,
.Xr le 4 ,
.Xr nfe 4 ,
.Xr rl 4 ,
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/amd64/conf/GENERIC Fri Dec 11 21:40:38 2020 (r368559)
@@ -271,7 +271,6 @@ device dc # DEC/Intel 21143 and various workalikes
device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device gem # Sun GEM/Sun ERI/Apple GMAC
-device hme # Sun HME (Happy Meal Ethernet)
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/conf/NOTES Fri Dec 11 21:40:38 2020 (r368559)
@@ -1867,7 +1867,6 @@ device xmphy # XaQti XMAC II
# fxp: Intel EtherExpress Pro/100B
# (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
# gem: Apple GMAC/Sun ERI/Sun GEM
-# hme: Sun HME (Happy Meal Ethernet)
# jme: JMicron JMC260 Fast Ethernet/JMC250 Gigabit Ethernet based adapters.
# le: AMD Am7900 LANCE and Am79C9xx PCnet
# lge: Support for PCI gigabit ethernet adapters based on the Level 1
@@ -1956,7 +1955,6 @@ device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
envvar hint.fxp.0.prefer_iomap="0"
device gem # Apple GMAC/Sun ERI/Sun GEM
-device hme # Sun HME (Happy Meal Ethernet)
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device mlxfw # Mellanox firmware update module
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/conf/files Fri Dec 11 21:40:38 2020 (r368559)
@@ -1816,8 +1816,6 @@ dev/gpio/gpiobus_if.m optional gpio
dev/gpio/gpiopps.c optional gpiopps fdt
dev/gpio/ofw_gpiobus.c optional fdt gpio
dev/hifn/hifn7751.c optional hifn
-dev/hme/if_hme.c optional hme
-dev/hme/if_hme_pci.c optional hme pci
dev/hptiop/hptiop.c optional hptiop scbus
dev/hwpmc/hwpmc_logging.c optional hwpmc
dev/hwpmc/hwpmc_mod.c optional hwpmc
Modified: head/sys/dev/sk/if_sk.c
==============================================================================
--- head/sys/dev/sk/if_sk.c Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/dev/sk/if_sk.c Fri Dec 11 21:40:38 2020 (r368559)
@@ -272,9 +272,7 @@ TUNABLE_INT("hw.skc.jumbo_disable", &jumbo_disable);
* UDP packets in Tx as the hardware can't differenciate UDP packets from
* TCP packets. 0 chcecksum value for UDP packet is an invalid one as it
* means sender didn't perforam checksum computation. For the safety I
- * disabled UDP checksum offload capability at the moment. Alternatively
- * we can intrduce a LINK0/LINK1 flag as hme(4) did in its Tx checksum
- * offload routine.
+ * disabled UDP checksum offload capability at the moment.
*/
#define SK_CSUM_FEATURES (CSUM_TCP)
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/i386/conf/GENERIC Fri Dec 11 21:40:38 2020 (r368559)
@@ -241,7 +241,6 @@ device dc # DEC/Intel 21143 and various workalikes
device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device gem # Sun GEM/Sun ERI/Apple GMAC
-device hme # Sun HME (Happy Meal Ethernet)
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/modules/Makefile Fri Dec 11 21:40:38 2020 (r368559)
@@ -130,7 +130,6 @@ SUBDIR= \
${_glxsb} \
gpio \
hifn \
- hme \
${_hpt27xx} \
${_hptiop} \
${_hptmv} \
Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c Fri Dec 11 20:01:45 2020 (r368558)
+++ head/sys/netpfil/pf/pf.c Fri Dec 11 21:40:38 2020 (r368559)
@@ -5666,7 +5666,7 @@ bad:
* CSUM_DATA_VALID :
* network driver performed cksum, needs to additional pseudo header
* cksum computation with partial csum_data(i.e. lack of H/W support for
- * pseudo header, for instance hme(4), sk(4) and possibly gem(4))
+ * pseudo header, for instance sk(4) and possibly gem(4))
*
* After validating the cksum of packet, set both flag CSUM_DATA_VALID and
* CSUM_PSEUDO_HDR in order to avoid recomputation of the cksum in upper
More information about the svn-src-all
mailing list