PERFORCE change 143705 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=143705

Change 143705 by zec at 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 <sys/types.h>
 #include <sys/param.h>
@@ -49,6 +50,7 @@
 #include <sys/signalvar.h>
 #include <sys/filio.h>
 #include <sys/sockio.h>
+#include <sys/vimage.h>
 
 #include <sys/socket.h>
 #include <sys/vnode.h>
@@ -66,6 +68,7 @@
 #include <net/route.h>
 
 #ifdef INET
+#include <netinet/vinet.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/in_systm.h>
@@ -76,6 +79,7 @@
 #endif
 
 #ifdef INET6
+#include <netinet6/vinet6.h>
 #include <netinet/icmp6.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
@@ -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++) {