From owner-svn-src-head@FreeBSD.ORG Wed Apr 20 12:58:30 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB8D0106566B; Wed, 20 Apr 2011 12:58:30 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C9E9E8FC0A; Wed, 20 Apr 2011 12:58:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3KCwU3K049198; Wed, 20 Apr 2011 12:58:30 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3KCwUVo049188; Wed, 20 Apr 2011 12:58:30 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201104201258.p3KCwUVo049188@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 20 Apr 2011 12:58:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220885 - head/sys/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Apr 2011 12:58:31 -0000 Author: bz Date: Wed Apr 20 12:58:30 2011 New Revision: 220885 URL: http://svn.freebsd.org/changeset/base/220885 Log: Compile in in_cksum* implementations for both IPv6 and IPv6. While in_pseudo() etc. is often used in offloading feature support, in_cksum() is mostly used to fix some broken hardware. Keeping both around for the moment allows us to compile NIC drivers even in an IPv6 only environment without the need to mangle them with #ifdef INETs in a way they are not prepared for. This will leave some dead code paths that will not be exercised for IPv6. Reviewed by: gnn Sponsored by: The FreeBSD Foundation Sponsored by: iXsystems MFC after: 3 days Modified: head/sys/conf/files.amd64 head/sys/conf/files.arm head/sys/conf/files.i386 head/sys/conf/files.ia64 head/sys/conf/files.mips head/sys/conf/files.pc98 head/sys/conf/files.powerpc head/sys/conf/files.sparc64 head/sys/conf/files.sun4v Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.amd64 Wed Apr 20 12:58:30 2011 (r220885) @@ -106,7 +106,7 @@ amd64/amd64/exception.S standard amd64/amd64/fpu.c standard amd64/amd64/gdb_machdep.c optional gdb amd64/amd64/identcpu.c standard -amd64/amd64/in_cksum.c optional inet +amd64/amd64/in_cksum.c optional inet | inet6 amd64/amd64/initcpu.c standard amd64/amd64/intr_machdep.c standard amd64/amd64/io.c optional io Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.arm Wed Apr 20 12:58:30 2011 (r220885) @@ -24,8 +24,8 @@ arm/arm/fiq_subr.S standard arm/arm/fusu.S standard arm/arm/gdb_machdep.c optional gdb arm/arm/identcpu.c standard -arm/arm/in_cksum.c optional inet -arm/arm/in_cksum_arm.S optional inet +arm/arm/in_cksum.c optional inet | inet6 +arm/arm/in_cksum_arm.S optional inet | inet6 arm/arm/intr.c standard arm/arm/locore.S standard no-obj arm/arm/machdep.c standard Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.i386 Wed Apr 20 12:58:30 2011 (r220885) @@ -283,7 +283,7 @@ i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem i386/i386/identcpu.c standard -i386/i386/in_cksum.c optional inet +i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard i386/i386/io.c optional io Modified: head/sys/conf/files.ia64 ============================================================================== --- head/sys/conf/files.ia64 Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.ia64 Wed Apr 20 12:58:30 2011 (r220885) @@ -85,7 +85,7 @@ ia64/ia64/emulate.c standard ia64/ia64/exception.S standard ia64/ia64/gdb_machdep.c optional gdb ia64/ia64/highfp.c standard -ia64/ia64/in_cksum.c optional inet +ia64/ia64/in_cksum.c optional inet | inet6 ia64/ia64/interrupt.c standard ia64/ia64/iodev_machdep.c optional io ia64/ia64/locore.S standard no-obj Modified: head/sys/conf/files.mips ============================================================================== --- head/sys/conf/files.mips Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.mips Wed Apr 20 12:58:30 2011 (r220885) @@ -53,7 +53,7 @@ mips/mips/db_disasm.c optional ddb mips/mips/db_interface.c optional ddb mips/mips/db_trace.c optional ddb mips/mips/dump_machdep.c standard -mips/mips/in_cksum.c optional inet +mips/mips/in_cksum.c optional inet | inet6 mips/mips/locore.S standard no-obj mips/mips/minidump_machdep.c standard mips/mips/mem.c optional mem Modified: head/sys/conf/files.pc98 ============================================================================== --- head/sys/conf/files.pc98 Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.pc98 Wed Apr 20 12:58:30 2011 (r220885) @@ -142,7 +142,7 @@ i386/i386/exception.s standard i386/i386/gdb_machdep.c optional gdb i386/i386/i686_mem.c optional mem i386/i386/identcpu.c standard -i386/i386/in_cksum.c optional inet +i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard i386/i386/io.c optional io Modified: head/sys/conf/files.powerpc ============================================================================== --- head/sys/conf/files.powerpc Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.powerpc Wed Apr 20 12:58:30 2011 (r220885) @@ -176,7 +176,7 @@ powerpc/powerpc/exec_machdep.c standard powerpc/powerpc/fpu.c optional aim powerpc/powerpc/fuswintr.c standard powerpc/powerpc/gdb_machdep.c optional gdb -powerpc/powerpc/in_cksum.c optional inet +powerpc/powerpc/in_cksum.c optional inet | inet6 powerpc/powerpc/intr_machdep.c standard powerpc/powerpc/iommu_if.m standard powerpc/powerpc/mem.c optional mem Modified: head/sys/conf/files.sparc64 ============================================================================== --- head/sys/conf/files.sparc64 Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.sparc64 Wed Apr 20 12:58:30 2011 (r220885) @@ -105,7 +105,7 @@ sparc64/sparc64/eeprom.c optional eeprom eeprom sbus sparc64/sparc64/gdb_machdep.c optional gdb sparc64/sparc64/identcpu.c standard -sparc64/sparc64/in_cksum.c optional inet +sparc64/sparc64/in_cksum.c optional inet | inet6 sparc64/sparc64/interrupt.S standard no-obj \ compile-with "${NORMAL_S} -mcpu=ultrasparc" sparc64/sparc64/intr_machdep.c standard Modified: head/sys/conf/files.sun4v ============================================================================== --- head/sys/conf/files.sun4v Wed Apr 20 11:17:21 2011 (r220884) +++ head/sys/conf/files.sun4v Wed Apr 20 12:58:30 2011 (r220885) @@ -63,7 +63,7 @@ sun4v/sun4v/hvcons.c standard sun4v/sun4v/hcall.S standard sun4v/sun4v/hviommu.c standard sparc64/sparc64/identcpu.c standard -sparc64/sparc64/in_cksum.c optional inet +sparc64/sparc64/in_cksum.c optional inet | inet6 sun4v/sun4v/interrupt.S standard no-obj sun4v/sun4v/intr_machdep.c standard sun4v/sun4v/locore.S standard no-obj