From vd@v5d.org  Tue May  8 08:45:21 2007
Return-Path: <vd@v5d.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 62A3016A401;
	Tue,  8 May 2007 08:45:21 +0000 (UTC)
	(envelope-from vd@v5d.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
	by mx1.freebsd.org (Postfix) with ESMTP id 5553A13C465;
	Tue,  8 May 2007 08:45:21 +0000 (UTC)
	(envelope-from vd@v5d.org)
Received: from mail.v5d.org (root@localhost [127.0.0.1])
	by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l488jKEZ062724;
	Tue, 8 May 2007 08:45:21 GMT
	(envelope-from vd@v5d.org)
Received: by mail.v5d.org (Postfix, from userid 1002)
	id EB8A5413F; Tue,  8 May 2007 11:45:23 +0300 (EEST)
Message-Id: <20070508084523.GA97464@polejan.hw.v5d.org>
Date: Tue, 8 May 2007 11:45:23 +0300
From: Vasil Dimov <vd@freebsd.org>
Reply-To: vd@freebsd.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] fix kernel build without INET6 on -CURRENT
X-Send-Pr-Version: 3.113

>Number:         112517
>Category:       kern
>Synopsis:       [patch] fix kernel build without INET6 on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 08 08:50:03 GMT 2007
>Closed-Date:    Wed May 09 06:10:16 GMT 2007
>Last-Modified:  Wed May  9 06:20:06 GMT 2007
>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@vomid.lisav        Software Developer @ Oracle/Innobase Oy
gro.DSBeerF@dv                Committer @ FreeBSD.org
gro.d5v@dv                    Home @ Sofia, Bulgaria
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: maxim 
State-Changed-When: Wed May 9 06:09:55 UTC 2007 
State-Changed-Why:  
Fixed in HEAD.  Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=112517 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/112517: commit references a PR
Date: Wed,  9 May 2007 06:09:47 +0000 (UTC)

 maxim       2007-05-09 06:09:41 UTC
 
   FreeBSD src repository
 
   Modified files:
     sys/netinet          tcp_input.c 
   Log:
   o Unbreak "options TCPDEBUG" && "nooptions INET6" kernel build.
   
   PR:             kern/112517
   Submitted by:   vd
   
   Revision  Changes    Path
   1.347     +2 -0      src/sys/netinet/tcp_input.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
