From owner-svn-src-head@FreeBSD.ORG  Mon Jun  1 21:29:55 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 17CA4106564A;
	Mon,  1 Jun 2009 21:29:55 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 065F28FC1C;
	Mon,  1 Jun 2009 21:29:55 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51LTsQU092818;
	Mon, 1 Jun 2009 21:29:54 GMT (envelope-from zec@svn.freebsd.org)
Received: (from zec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51LTsN7092816;
	Mon, 1 Jun 2009 21:29:54 GMT (envelope-from zec@svn.freebsd.org)
Message-Id: <200906012129.n51LTsN7092816@svn.freebsd.org>
From: Marko Zec <zec@FreeBSD.org>
Date: Mon, 1 Jun 2009 21:29:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193274 - in head/sys: contrib/pf/net netinet6
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 21:29:55 -0000

Author: zec
Date: Mon Jun  1 21:29:54 2009
New Revision: 193274
URL: http://svn.freebsd.org/changeset/base/193274

Log:
  V_loif is not an array but a pure pointer, so treat it as such.
  
  Reviewed by:	bz
  Approved by:	julian (mentor)

Modified:
  head/sys/contrib/pf/net/pf_ioctl.c
  head/sys/netinet6/ip6_input.c

Modified: head/sys/contrib/pf/net/pf_ioctl.c
==============================================================================
--- head/sys/contrib/pf/net/pf_ioctl.c	Mon Jun  1 21:26:52 2009	(r193273)
+++ head/sys/contrib/pf/net/pf_ioctl.c	Mon Jun  1 21:29:54 2009	(r193274)
@@ -3717,7 +3717,7 @@ pf_check6_in(void *arg, struct mbuf **m,
 	 * order to support scoped addresses. In order to support stateful
 	 * filtering we have change this to lo0 as it is the case in IPv4.
 	 */
-	chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &V_loif[0] : ifp, m,
+	chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? V_loif : ifp, m,
 	    NULL, inp);
 	if (chk && *m) {
 		m_freem(*m);

Modified: head/sys/netinet6/ip6_input.c
==============================================================================
--- head/sys/netinet6/ip6_input.c	Mon Jun  1 21:26:52 2009	(r193273)
+++ head/sys/netinet6/ip6_input.c	Mon Jun  1 21:29:54 2009	(r193274)
@@ -380,7 +380,7 @@ ip6_input(struct mbuf *m)
 #define M2MMAX	(sizeof(V_ip6stat.ip6s_m2m)/sizeof(V_ip6stat.ip6s_m2m[0]))
 		if (m->m_next) {
 			if (m->m_flags & M_LOOP) {
-				V_ip6stat.ip6s_m2m[V_loif[0].if_index]++; /* XXX */
+				V_ip6stat.ip6s_m2m[V_loif->if_index]++;
 			} else if (m->m_pkthdr.rcvif->if_index < M2MMAX)
 				V_ip6stat.ip6s_m2m[m->m_pkthdr.rcvif->if_index]++;
 			else