From owner-svn-src-all@FreeBSD.ORG  Mon Oct 28 10:12:19 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B99B2909;
 Mon, 28 Oct 2013 10:12:19 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A6F9F20F4;
 Mon, 28 Oct 2013 10:12:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9SACJJP001924;
 Mon, 28 Oct 2013 10:12:19 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9SACJPF001923;
 Mon, 28 Oct 2013 10:12:19 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201310281012.r9SACJPF001923@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 28 Oct 2013 10:12:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257246 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Oct 2013 10:12:19 -0000

Author: glebius
Date: Mon Oct 28 10:12:19 2013
New Revision: 257246
URL: http://svnweb.freebsd.org/changeset/base/257246

Log:
  - Fix VIMAGE build.
  - Fix build with gcc.

Modified:
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Mon Oct 28 09:43:15 2013	(r257245)
+++ head/sys/netpfil/pf/pf.c	Mon Oct 28 10:12:19 2013	(r257246)
@@ -4554,7 +4554,7 @@ pf_icmp_state_lookup(struct pf_state_key
 	if ((*state)->rule.ptr->type &&
 	    (((*state)->direction == direction) ?
 	    PF_IN : PF_OUT) != icmp_dir) {
-		if (pf_status.debug >= PF_DEBUG_MISC) {
+		if (V_pf_status.debug >= PF_DEBUG_MISC) {
 			printf("pf: icmp type %d in wrong direction (%d): ",
 			    icmp_dir, direction);
 			pf_print_state(*state);
@@ -4593,6 +4593,8 @@ pf_test_state_icmp(struct pf_state **sta
 
 		break;
 #endif /* INET6 */
+	default:
+		panic("%s: proto %d\n", __func__, pd->proto);
 	}
 
 	if (pf_icmp_mapping(pd, icmptype, &icmp_dir, &multi,