Date: Sat, 15 Nov 2008 01:34:30 GMT From: Qing Li <qingli@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 152984 for review Message-ID: <200811150134.mAF1YUC3042703@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=152984 Change 152984 by qingli@FreeBSD-newarp on 2008/11/15 01:34:16 Incorporate the missing vnet macros there were missed from the last integrate. Affected files ... .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#9 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#6 edit Differences ... ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#9 (text+ko) ==== @@ -244,12 +244,9 @@ struct llentry *la = 0; u_int flags; int error; - int fibnum = -1; - *lle = NULL; - if (m) { if (m->m_flags & M_BCAST) { /* broadcast */ ==== //depot/projects/arp-v2/src/sys/netinet6/nd6.c#6 (text+ko) ==== @@ -419,6 +419,10 @@ ln = (struct llentry *)arg; ifp = ln->lle_tbl->llt_ifp; + + CURVNET_SET(ifp->if_vnet); + INIT_VNET_INET6(curvnet); + IF_LLTBLS_LOCK(ifp); if (ln->ln_ntick > 0) { @@ -516,6 +520,7 @@ break; } IF_LLTBLS_UNLOCK(ifp); + CURVNET_RESTORE(); } @@ -721,6 +726,7 @@ void nd6_purge(struct ifnet *ifp) { + INIT_VNET_INET6(ifp->if_vnet); struct nd_defrouter *dr, *ndr; struct nd_prefix *pr, *npr; @@ -800,6 +806,7 @@ struct llentry * nd6_lookup(struct in6_addr *addr6, int create, struct ifnet *ifp) { + INIT_VNET_INET6(curvnet); struct sockaddr_in6 sin6; struct llentry *ln; int flags = 0; @@ -928,6 +935,7 @@ static struct llentry * nd6_free(struct llentry *ln, int gc) { + INIT_VNET_INET6(curvnet); struct llentry *next; struct nd_defrouter *dr; struct ifnet *ifp=NULL; @@ -1033,6 +1041,7 @@ void nd6_nud_hint(struct rtentry *rt, struct in6_addr *dst6, int force) { + INIT_VNET_INET6(curvnet); struct llentry *ln; /* struct ifnet *ifp = rt->rt_ifp;*/ @@ -1311,6 +1320,7 @@ nd6_cache_lladdr(struct ifnet *ifp, struct in6_addr *from, char *lladdr, int lladdrlen, int type, int code) { + INIT_VNET_INET6(curvnet); struct llentry *ln = NULL; int is_newentry; int do_update;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811150134.mAF1YUC3042703>