Date: Fri, 29 May 2009 14:56:26 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163023 for review Message-ID: <200905291456.n4TEuQQE054071@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163023 Change 163023 by zec@zec_tpx32 on 2009/05/29 14:56:02 Reduce diff against head by trimming out WS changes and some other debugging / leftover noise. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#66 edit .. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#12 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#38 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#66 (text+ko) ==== @@ -1024,7 +1024,6 @@ } ifp->if_afdata_initialized = 0; IF_AFDATA_UNLOCK(ifp); - ifp->if_afdata_initialized = 0; if (!vmove) ifq_detach(&ifp->if_snd); ==== //depot/projects/vimage-commit2/src/sys/net/if_clone.c#12 (text+ko) ==== @@ -344,7 +344,6 @@ static void if_clone_free(struct if_clone *ifc) { - for (int bytoff = 0; bytoff < ifc->ifc_bmlen; bytoff++) { KASSERT(ifc->ifc_units[bytoff] == 0x00, ("ifc_units[%d] is not empty", bytoff)); @@ -504,6 +503,7 @@ { int bytoff, bitoff; + /* * Compute offset in the bitmap and deallocate the unit. */ ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#27 (text+ko) ==== @@ -731,6 +731,7 @@ * to call ifnet_byindex() instead if ifnet_byindex_ref(). */ struct ifnet *ifnet_byindex(u_short idx); +struct ifnet *ifnet_byindex_locked(u_short idx); struct ifnet *ifnet_byindex_ref(u_short idx); /* ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#38 (text+ko) ==== @@ -609,7 +609,6 @@ IGMP_LOCK(); igi = ((struct in_ifinfo *)ifp->if_afdata[AF_INET])->ii_igmp; - KASSERT(igi != NULL, ("%s: no igmp_ifinfo for ifp %p", __func__, ifp)); if (igi->igi_version == IGMP_VERSION_3) { IF_ADDR_LOCK(ifp); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905291456.n4TEuQQE054071>