From owner-p4-projects@FreeBSD.ORG Sun Aug 17 00:30:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27854106567E; Sun, 17 Aug 2008 00:30:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8EF7106566C for ; Sun, 17 Aug 2008 00:30:57 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B3E8D8FC23 for ; Sun, 17 Aug 2008 00:30:57 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7H0Uvtt004551 for ; Sun, 17 Aug 2008 00:30:57 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7H0UvSF004549 for perforce@freebsd.org; Sun, 17 Aug 2008 00:30:57 GMT (envelope-from bz@freebsd.org) Date: Sun, 17 Aug 2008 00:30:57 GMT Message-Id: <200808170030.m7H0UvSF004549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" To: Perforce Change Reviews Cc: Subject: PERFORCE change 147620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Aug 2008 00:30:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=147620 Change 147620 by bz@bz_dumpster on 2008/08/17 00:30:03 A few ore missed V_ Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#5 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#6 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#8 (text+ko) ==== @@ -432,7 +432,7 @@ "ICMP6 checksum error(%d|%x) %s\n", icmp6->icmp6_type, sum, ip6_sprintf(ip6bufs, &ip6->ip6_src))); - icmp6stat.icp6s_checksum++; + V_icmp6stat.icp6s_checksum++; goto freeit; } ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#5 (text+ko) ==== @@ -229,7 +229,7 @@ if_name(ifp), (unsigned long)ndi->maxmtu); } - if (ndi->maxmtu > in6_maxmtu) + if (ndi->maxmtu > V_in6_maxmtu) in6_setmaxmtu(); /* check all interfaces just in case */ #undef MIN ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#5 (text+ko) ==== @@ -596,7 +596,7 @@ #else IP6_EXTHDR_GET(nd_na, struct nd_neighbor_advert *, m, off, icmp6len); if (nd_na == NULL) { - icmp6stat.icp6s_tooshort++; + V_icmp6stat.icp6s_tooshort++; return; } #endif ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#5 (text+ko) ==== @@ -189,7 +189,7 @@ return; bad: - icmp6stat.icp6s_badrs++; + V_icmp6stat.icp6s_badrs++; m_freem(m); } @@ -244,7 +244,7 @@ #else IP6_EXTHDR_GET(nd_ra, struct nd_router_advert *, m, off, icmp6len); if (nd_ra == NULL) { - icmp6stat.icp6s_tooshort++; + V_icmp6stat.icp6s_tooshort++; return; } #endif @@ -621,7 +621,7 @@ if (V_ip6_forwarding || !V_ip6_accept_rtadv) { nd6log((LOG_WARNING, "defrouter_select: called unexpectedly (forwarding=%d, " - "accept_rtadv=%d)\n", ip6_forwarding, ip6_accept_rtadv)); + "accept_rtadv=%d)\n", ip6_forwarding, V_ip6_accept_rtadv)); splx(s); return; } ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#8 (text+ko) ==== @@ -1937,7 +1937,7 @@ static void ipsec_attach(void) { - SECPOLICY_LOCK_INIT(&ip4_def_policy); + SECPOLICY_LOCK_INIT(&V_ip4_def_policy); ip4_def_policy.refcnt = 1; /* NB: disallow free */ } SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL);