From owner-svn-src-projects@FreeBSD.ORG  Sat Feb 19 17:10:11 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 251C91065675;
	Sat, 19 Feb 2011 17:10:11 +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 150768FC16;
	Sat, 19 Feb 2011 17:10:11 +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 p1JHAAaj003381;
	Sat, 19 Feb 2011 17:10:10 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1JHAAW4003379;
	Sat, 19 Feb 2011 17:10:10 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201102191710.p1JHAAW4003379@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 19 Feb 2011 17:10:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218857 - projects/pf/pf45/sys/contrib/pf/net
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Feb 2011 17:10:11 -0000

Author: bz
Date: Sat Feb 19 17:10:10 2011
New Revision: 218857
URL: http://svn.freebsd.org/changeset/base/218857

Log:
  Make compile without INET6 (not sure about w/o INET yet).

Modified:
  projects/pf/pf45/sys/contrib/pf/net/pf.c

Modified: projects/pf/pf45/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/pf45/sys/contrib/pf/net/pf.c	Sat Feb 19 17:09:26 2011	(r218856)
+++ projects/pf/pf45/sys/contrib/pf/net/pf.c	Sat Feb 19 17:10:10 2011	(r218857)
@@ -3663,18 +3663,26 @@ pf_test_rule(struct pf_rule **rm, struct
 		    !(th->th_flags & TH_RST)) {
 			u_int32_t	 ack = ntohl(th->th_seq) + pd->p_len;
 			int		 len = 0;
+#ifdef INET
 			struct ip	*h4;
+#endif
+#ifdef INET6
 			struct ip6_hdr	*h6;
+#endif
 
 			switch (af) {
+#ifdef INET
 			case AF_INET:
 				h4 = mtod(m, struct ip *);
 				len = ntohs(h4->ip_len) - off;
 				break;
+#endif
+#ifdef INET6
 			case AF_INET6:
 				h6 = mtod(m, struct ip6_hdr *);
 				len = ntohs(h6->ip6_plen) - (off - sizeof(*h6));
 				break;
+#endif
 			}
 
 			if (pf_check_proto_cksum(m, off, len, IPPROTO_TCP, af))