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

9 files changed, 10 insertions, 10 deletions

diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 6480b8a..7916845 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -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
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 95dfe4b..05fd823 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -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
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index eebfaa8..f518bc9 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -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
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index e5d116f..a746cbb 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -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
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index 317bb83..7ad93a5 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -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
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 8722d13..5db5421 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -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
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 217b8fe..42bf6f2 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -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
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 6860d06..ed93d1c 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -105,7 +105,7 @@ sparc64/sparc64/eeprom.c	optional	eeprom ebus | eeprom fhc | \
 						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
diff --git a/sys/conf/files.sun4v b/sys/conf/files.sun4v
index 46ece4b..7a33442 100644
--- a/sys/conf/files.sun4v
+++ b/sys/conf/files.sun4v
@@ -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