svn commit: r193274 - in head/sys: contrib/pf/net netinet6

[Marko Zec]

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