From owner-svn-src-projects@FreeBSD.ORG Sun Jun 3 05:47:43 2012
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 6EEE01065670;
Sun, 3 Jun 2012 05:47:43 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 41AF28FC0A;
Sun, 3 Jun 2012 05:47:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q535lhar037506;
Sun, 3 Jun 2012 05:47:43 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q535lhc4037504;
Sun, 3 Jun 2012 05:47:43 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201206030547.q535lhc4037504@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 3 Jun 2012 05:47:43 +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: r236499 - projects/pf/head/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 " projects"
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: Sun, 03 Jun 2012 05:47:43 -0000
Author: glebius
Date: Sun Jun 3 05:47:42 2012
New Revision: 236499
URL: http://svn.freebsd.org/changeset/base/236499
Log:
Fix !INET6 build.
Modified:
projects/pf/head/sys/contrib/pf/net/pf.c
Modified: projects/pf/head/sys/contrib/pf/net/pf.c
==============================================================================
--- projects/pf/head/sys/contrib/pf/net/pf.c Sun Jun 3 05:36:25 2012 (r236498)
+++ projects/pf/head/sys/contrib/pf/net/pf.c Sun Jun 3 05:47:42 2012 (r236499)
@@ -220,6 +220,9 @@ static int pf_modulate_sack(struct mbu
#ifdef INET6
static void pf_change_a6(struct pf_addr *, u_int16_t *,
struct pf_addr *, u_int8_t);
+static void pf_route6(struct mbuf **, struct pf_rule *, int,
+ struct ifnet *, struct pf_state *,
+ struct pf_pdesc *);
#endif /* INET6 */
static void pf_change_icmp(struct pf_addr *, u_int16_t *,
struct pf_addr *, struct pf_addr *, u_int16_t,
@@ -275,9 +278,6 @@ static int pf_test_state_other(struct
static void pf_route(struct mbuf **, struct pf_rule *, int,
struct ifnet *, struct pf_state *,
struct pf_pdesc *);
-static void pf_route6(struct mbuf **, struct pf_rule *, int,
- struct ifnet *, struct pf_state *,
- struct pf_pdesc *);
static u_int8_t pf_get_wscale(struct mbuf *, int, u_int16_t,
sa_family_t);
static u_int16_t pf_get_mss(struct mbuf *, int, u_int16_t,
@@ -1266,21 +1266,25 @@ pf_intr(void *v)
STAILQ_FOREACH_SAFE(pfse, &queue, pfse_next, next) {
switch (pfse->pfse_type) {
+#ifdef INET
case PFSE_IP:
ip_output(pfse->pfse_m, NULL, NULL, 0, NULL, NULL);
break;
- case PFSE_IP6:
- ip6_output(pfse->pfse_m, NULL, NULL, 0, NULL, NULL,
- NULL);
- break;
case PFSE_ICMP:
icmp_error(pfse->pfse_m, pfse->pfse_icmp_type,
pfse->pfse_icmp_code, 0, pfse->pfse_icmp_mtu);
break;
+#endif /* INET */
+#ifdef INET6
+ case PFSE_IP6:
+ ip6_output(pfse->pfse_m, NULL, NULL, 0, NULL, NULL,
+ NULL);
+ break;
case PFSE_ICMP6:
icmp6_error(pfse->pfse_m, pfse->pfse_icmp_type,
pfse->pfse_icmp_code, pfse->pfse_icmp_mtu);
break;
+#endif /* INET6 */
default:
panic("%s: unknown type", __func__);
}