svn commit: r206630 - in user/imp/tbemd/sys: amd64/conf boot/forth conf contrib/ipfilter/netinet dev/sge i386/conf modules modules/sge

[Warner Losh]

Author: imp
Date: Wed Apr 14 20:59:37 2010
New Revision: 206630
URL: http://svn.freebsd.org/changeset/base/206630

Log:
  svn merge svn+ssh://svn.freebsd.org/base/head@206627

Added:
  user/imp/tbemd/sys/dev/sge/
     - copied from r206627, head/sys/dev/sge/
  user/imp/tbemd/sys/modules/sge/
     - copied from r206627, head/sys/modules/sge/
Modified:
  user/imp/tbemd/sys/amd64/conf/GENERIC
  user/imp/tbemd/sys/boot/forth/loader.conf
  user/imp/tbemd/sys/conf/NOTES
  user/imp/tbemd/sys/conf/files
  user/imp/tbemd/sys/contrib/ipfilter/netinet/ip_compat.h
  user/imp/tbemd/sys/i386/conf/GENERIC
  user/imp/tbemd/sys/modules/Makefile
Directory Properties:
  user/imp/tbemd/   (props changed)
  user/imp/tbemd/contrib/tzcode/stdtime/   (props changed)
  user/imp/tbemd/contrib/tzcode/zic/   (props changed)
  user/imp/tbemd/contrib/tzdata/   (props changed)
  user/imp/tbemd/lib/libz/   (props changed)
  user/imp/tbemd/sys/contrib/x86emu/   (props changed)

Modified: user/imp/tbemd/sys/amd64/conf/GENERIC
==============================================================================
--- user/imp/tbemd/sys/amd64/conf/GENERIC	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/amd64/conf/GENERIC	Wed Apr 14 20:59:37 2010	(r206630)
@@ -224,6 +224,7 @@ device		pcn		# AMD Am79C97x PCI 10/100 (
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)

Modified: user/imp/tbemd/sys/boot/forth/loader.conf
==============================================================================
--- user/imp/tbemd/sys/boot/forth/loader.conf	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/boot/forth/loader.conf	Wed Apr 14 20:59:37 2010	(r206630)
@@ -271,6 +271,7 @@ if_rl_load="NO"			# RealTek 8129/8139
 if_rue_load="NO"		# RealTek RTL8150 USB to Fast Ethernet
 if_sbni_load="NO"		# Granch SBNI12 leased line adapters
 if_sf_load="NO"			# Adaptec Duralink PCI (AIC-6915 "starfire")
+if_sge_load="NO"		# Silicon Integrated Systems SiS190/191
 if_sis_load="NO"		# Silicon Integrated Systems SiS 900/7016
 if_sk_load="NO"			# SysKonnect SK-984x series PCI Gigabit Ethernet
 if_sn_load="NO"			# SMC 91Cxx

Modified: user/imp/tbemd/sys/conf/NOTES
==============================================================================
--- user/imp/tbemd/sys/conf/NOTES	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/conf/NOTES	Wed Apr 14 20:59:37 2010	(r206630)
@@ -1952,6 +1952,7 @@ device		xmphy		# XaQti XMAC II
 #       This includes dual and quad port cards, as well as one 100baseFX card.
 #       Most of these are 64-bit PCI devices, except for one single port
 #       card which is 32-bit.
+# sge:  Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet adapter
 # sis:  Support for NICs based on the Silicon Integrated Systems SiS 900,
 #       SiS 7016 and NS DP83815 PCI fast ethernet controller chips.
 # sk:   Support for the SysKonnect SK-984x series PCI gigabit ethernet NICs.
@@ -2046,6 +2047,7 @@ device		re		# RealTek 8139C+/8169/8169S/
 device		rl		# RealTek 8129/8139
 device		pcn		# AMD Am79C97x PCI 10/100 NICs
 device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)

Modified: user/imp/tbemd/sys/conf/files
==============================================================================
--- user/imp/tbemd/sys/conf/files	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/conf/files	Wed Apr 14 20:59:37 2010	(r206630)
@@ -1490,6 +1490,7 @@ dev/scd/scd.c			optional scd isa
 dev/scd/scd_isa.c		optional scd isa
 dev/sdhci/sdhci.c		optional sdhci pci
 dev/sf/if_sf.c			optional sf pci
+dev/sge/if_sge.c		optional sge pci
 dev/si/si.c			optional si
 dev/si/si2_z280.c		optional si
 dev/si/si3_t225.c		optional si

Modified: user/imp/tbemd/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- user/imp/tbemd/sys/contrib/ipfilter/netinet/ip_compat.h	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/contrib/ipfilter/netinet/ip_compat.h	Wed Apr 14 20:59:37 2010	(r206630)
@@ -975,7 +975,6 @@ typedef	u_int32_t	u_32_t;
 #   define	SPL_NET(x)	;
 #   define	SPL_IMP(x)	;
 #   define	SPL_SCHED(x)	;
-extern	int	in_cksum __P((struct mbuf *, int));
 #  else
 #   define	SPL_SCHED(x)	x = splhigh()
 #  endif /* __FreeBSD_version >= 500043 */

Modified: user/imp/tbemd/sys/i386/conf/GENERIC
==============================================================================
--- user/imp/tbemd/sys/i386/conf/GENERIC	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/i386/conf/GENERIC	Wed Apr 14 20:59:37 2010	(r206630)
@@ -235,6 +235,7 @@ device		pcn		# AMD Am79C97x PCI 10/100 (
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
 device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)

Modified: user/imp/tbemd/sys/modules/Makefile
==============================================================================
--- user/imp/tbemd/sys/modules/Makefile	Wed Apr 14 20:55:33 2010	(r206629)
+++ user/imp/tbemd/sys/modules/Makefile	Wed Apr 14 20:59:37 2010	(r206630)
@@ -252,6 +252,7 @@ SUBDIR=	${_3dfx} \
 	sdhci \
 	sem \
 	sf \
+	sge \
 	siba_bwn \
 	siis \
 	sis \