kern/112517: [patch] fix kernel build without INET6 on -CURRENT

[Vasil Dimov]

>Number:         112517
>Category:       kern
>Synopsis:       [patch] fix kernel build without INET6 on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 08 08:50:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
N/A
>Environment:

Irrelevant

>Description:

The kernel does not compile without "options INET6", see the patch.

>How-To-Repeat:

Try to compile the kernel without "options INET6".

>Fix:

--- tcp_input.c_ip6.diff begins here ---
--- ./sys/netinet/tcp_input.c.orig	Mon May  7 21:07:45 2007
+++ ./sys/netinet/tcp_input.c	Mon May  7 21:11:24 2007
@@ -780,9 +780,11 @@
 #ifdef TCPDEBUG
 	if (so->so_options & SO_DEBUG) {
 		ostate = tp->t_state;
+#ifdef INET6
 		if (isipv6)
 			bcopy((char *)ip6, (char *)tcp_saveipgen, sizeof(*ip6));
 		else
+#endif /* INET6 */
 			bcopy((char *)ip, (char *)tcp_saveipgen, sizeof(*ip));
 		tcp_savetcp = *th;
 	}
--- tcp_input.c_ip6.diff ends here ---


-- 
Vasil Dimov
moc.elcaro at vomid.lisav        Software Developer @ Oracle/Innobase Oy
gro.DSBeerF at dv                Committer @ FreeBSD.org
gro.d5v at dv                    Home @ Sofia, Bulgaria
>Release-Note:
>Audit-Trail:
>Unformatted: