From owner-p4-projects@FreeBSD.ORG Wed Jun 18 16:50:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FAC21065685; Wed, 18 Jun 2008 16:50:11 +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 D55301065682 for ; Wed, 18 Jun 2008 16:50:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BC8338FC30 for ; Wed, 18 Jun 2008 16:50:10 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5IGoAb0081914 for ; Wed, 18 Jun 2008 16:50:10 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IGoALj081912 for perforce@freebsd.org; Wed, 18 Jun 2008 16:50:10 GMT (envelope-from zec@FreeBSD.org) Date: Wed, 18 Jun 2008 16:50:10 GMT Message-Id: <200806181650.m5IGoALj081912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143705 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: Wed, 18 Jun 2008 16:50:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=143705 Change 143705 by zec@zec_tpx32 on 2008/06/18 16:49:40 Small but futile steps towards LINT compile. Affected files ... .. //depot/projects/vimage/src/sys/net/if.c#26 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#29 edit .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#8 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if.c#26 (text+ko) ==== @@ -317,6 +317,7 @@ static void if_init(void *dummy __unused) { + #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); #else @@ -2601,6 +2602,7 @@ void if_delmulti_ifma(struct ifmultiaddr *ifma) { + INIT_VNET_NET(curvnet); struct ifnet *ifp; int lastref; @@ -2612,7 +2614,7 @@ struct ifnet *oifp; IFNET_RLOCK(); - TAILQ_FOREACH(oifp, &ifnet, if_link) + TAILQ_FOREACH(oifp, &V_ifnet, if_link) if (ifp == oifp) break; if (ifp != oifp) { ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#29 (text+ko) ==== @@ -131,10 +131,10 @@ }, 1, /* refs */ #ifdef NETGRAPH_DEBUG - ND_MAGIC, - __FILE__, - __LINE__, - {NULL} + .nd_magic = ND_MAGIC, + .lastfile = __FILE__, + .lastline = __LINE__, + .nd_all = {NULL} #endif /* NETGRAPH_DEBUG */ }; ==== //depot/projects/vimage/src/sys/netinet/ip_carp.c#8 (text+ko) ==== @@ -31,6 +31,7 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include #include @@ -49,6 +50,7 @@ #include #include #include +#include #include #include @@ -66,6 +68,7 @@ #include #ifdef INET +#include #include #include #include @@ -76,6 +79,7 @@ #endif #ifdef INET6 +#include #include #include #include @@ -913,6 +917,7 @@ ch.carp_cksum = 0; #ifdef INET + INIT_VNET_INET(curvnet); if (sc->sc_ia) { struct ip *ip; @@ -1451,6 +1456,7 @@ static int carp_set_addr(struct carp_softc *sc, struct sockaddr_in *sin) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in_ifaddr *ia, *ia_if; @@ -1470,7 +1476,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - TAILQ_FOREACH(ia, &in_ifaddrhead, ia_link) { + TAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { /* and, yeah, we need a multicast-capable iface too */ if (ia->ia_ifp != SC2IFP(sc) && (ia->ia_ifp->if_flags & IFF_MULTICAST) && @@ -1612,6 +1618,7 @@ static int carp_set_addr6(struct carp_softc *sc, struct sockaddr_in6 *sin6) { + INIT_VNET_INET6(curvnet); struct ifnet *ifp; struct carp_if *cif; struct in6_ifaddr *ia, *ia_if; @@ -1631,7 +1638,7 @@ /* we have to do it by hands to check we won't match on us */ ia_if = NULL; own = 0; - for (ia = in6_ifaddr; ia; ia = ia->ia_next) { + for (ia = V_in6_ifaddr; ia; ia = ia->ia_next) { int i; for (i = 0; i < 4; i++) {