From owner-svn-src-all@FreeBSD.ORG Sun Nov 13 01:03:30 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B82E0106564A; Sun, 13 Nov 2011 01:03:30 +0000 (UTC) (envelope-from benlaurie@gmail.com) Received: from mail-vx0-f182.google.com (mail-vx0-f182.google.com [209.85.220.182]) by mx1.freebsd.org (Postfix) with ESMTP id 348228FC0C; Sun, 13 Nov 2011 01:03:30 +0000 (UTC) Received: by vcbfo14 with SMTP id fo14so6306318vcb.13 for ; Sat, 12 Nov 2011 17:03:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=WBsDetVpP5nOKQICrGb4ma5VmOCZC1HeZZDv9sxs/HU=; b=xZUdMbCoSi/UGtL+lKC+2RKXyzqOAk0l13DrgwqAkrSWRT553I7H6bE9wqXOoD3mzg u6RLWeo98Qe9h648oaGbVi+dbvOJ+OyxabNJgcN/EPIw/IqrUwv6AloePYjn2kavn1Bo fkh2dZ5t3sPoNjC1cCBOCwBkhxQUAejd0iefA= MIME-Version: 1.0 Received: by 10.52.112.74 with SMTP id io10mr28087178vdb.116.1321144416362; Sat, 12 Nov 2011 16:33:36 -0800 (PST) Sender: benlaurie@gmail.com Received: by 10.52.114.102 with HTTP; Sat, 12 Nov 2011 16:33:36 -0800 (PST) In-Reply-To: <201111112257.pABMvqjl012442@svn.freebsd.org> References: <201111112257.pABMvqjl012442@svn.freebsd.org> Date: Sat, 12 Nov 2011 16:33:36 -0800 X-Google-Sender-Auth: KgqDDQDKmTwO0iaSUuH-7yDRPn4 Message-ID: From: Ben Laurie To: Brooks Davis Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227459 - in head/sys: dev/lmc net netgraph netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2011 01:03:30 -0000 On Fri, Nov 11, 2011 at 2:57 PM, Brooks Davis wrote: > Author: brooks > Date: Fri Nov 11 22:57:52 2011 > New Revision: 227459 > URL: http://svn.freebsd.org/changeset/base/227459 > > Log: > =A0In r191367 the need for if_free_type() was removed and a new member > =A0if_alloctype was used to store the origional interface type. =A0Take > =A0advantage of this change by removing all existing uses of if_free_type= () > =A0in favor of if_free(). Just an observation: this change removes an annotation that could be useful for correctness checking. Do we care? > > =A0MFC after: =A0 =A01 Month > > Modified: > =A0head/sys/dev/lmc/if_lmc.c > =A0head/sys/net/if_bridge.c > =A0head/sys/net/if_lagg.c > =A0head/sys/net/if_tap.c > =A0head/sys/net/if_vlan.c > =A0head/sys/netgraph/ng_fec.c > =A0head/sys/netinet/ip_carp.c > > Modified: head/sys/dev/lmc/if_lmc.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/dev/lmc/if_lmc.c =A0 Fri Nov 11 22:27:09 2011 =A0 =A0 =A0 = =A0(r227458) > +++ head/sys/dev/lmc/if_lmc.c =A0 Fri Nov 11 22:57:52 2011 =A0 =A0 =A0 = =A0(r227459) > @@ -4945,7 +4945,9 @@ lmc_ifnet_detach(softc_t *sc) > =A0 /* Detach from the ifnet kernel interface. */ > =A0 if_detach(sc->ifp); > > -# if (__FreeBSD_version >=3D 600000) > +# if (defined(__FreeBSD__) && __FreeBSD_version >=3D 800082) > + =A0if_free(sc->ifp); > +# elif (defined(__FreeBSD__) && __FreeBSD_version >=3D 600000) > =A0 if_free_type(sc->ifp, NSPPP ? IFT_PPP : IFT_OTHER); > =A0# endif > =A0 } > > Modified: head/sys/net/if_bridge.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_bridge.c =A0 =A0Fri Nov 11 22:27:09 2011 =A0 =A0 =A0 = =A0(r227458) > +++ head/sys/net/if_bridge.c =A0 =A0Fri Nov 11 22:57:52 2011 =A0 =A0 =A0 = =A0(r227459) > @@ -676,7 +676,7 @@ bridge_clone_destroy(struct ifnet *ifp) > > =A0 =A0 =A0 =A0bstp_detach(&sc->sc_stp); > =A0 =A0 =A0 =A0ether_ifdetach(ifp); > - =A0 =A0 =A0 if_free_type(ifp, IFT_ETHER); > + =A0 =A0 =A0 if_free(ifp); > > =A0 =A0 =A0 =A0/* Tear down the routing table. */ > =A0 =A0 =A0 =A0bridge_rtable_fini(sc); > > Modified: head/sys/net/if_lagg.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_lagg.c =A0 =A0 =A0Fri Nov 11 22:27:09 2011 =A0 =A0 = =A0 =A0(r227458) > +++ head/sys/net/if_lagg.c =A0 =A0 =A0Fri Nov 11 22:57:52 2011 =A0 =A0 = =A0 =A0(r227459) > @@ -275,7 +275,7 @@ lagg_clone_create(struct if_clone *ifc, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (lagg_protos[i].ti_proto =3D=3D LAGG_PR= OTO_DEFAULT) { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0sc->sc_proto =3D lagg_prot= os[i].ti_proto; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if ((error =3D lagg_protos= [i].ti_attach(sc)) !=3D 0) { > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if_free_typ= e(ifp, IFT_ETHER); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if_free(ifp= ); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free(sc, M= _DEVBUF); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return (er= ror); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} > @@ -293,7 +293,6 @@ lagg_clone_create(struct if_clone *ifc, > =A0 =A0 =A0 =A0ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_AUTO); > > =A0 =A0 =A0 =A0if_initname(ifp, ifc->ifc_name, unit); > - =A0 =A0 =A0 ifp->if_type =3D IFT_ETHER; > =A0 =A0 =A0 =A0ifp->if_softc =3D sc; > =A0 =A0 =A0 =A0ifp->if_start =3D lagg_start; > =A0 =A0 =A0 =A0ifp->if_init =3D lagg_init; > @@ -305,7 +304,7 @@ lagg_clone_create(struct if_clone *ifc, > =A0 =A0 =A0 =A0IFQ_SET_READY(&ifp->if_snd); > > =A0 =A0 =A0 =A0/* > - =A0 =A0 =A0 =A0* Attach as an ordinary ethernet device, childs will be = attached > + =A0 =A0 =A0 =A0* Attach as an ordinary ethernet device, children will b= e attached > =A0 =A0 =A0 =A0 * as special device IFT_IEEE8023ADLAG. > =A0 =A0 =A0 =A0 */ > =A0 =A0 =A0 =A0ether_ifattach(ifp, eaddr); > @@ -352,7 +351,7 @@ lagg_clone_destroy(struct ifnet *ifp) > > =A0 =A0 =A0 =A0ifmedia_removeall(&sc->sc_media); > =A0 =A0 =A0 =A0ether_ifdetach(ifp); > - =A0 =A0 =A0 if_free_type(ifp, IFT_ETHER); > + =A0 =A0 =A0 if_free(ifp); > > =A0 =A0 =A0 =A0mtx_lock(&lagg_list_mtx); > =A0 =A0 =A0 =A0SLIST_REMOVE(&lagg_list, sc, lagg_softc, sc_entries); > > Modified: head/sys/net/if_tap.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_tap.c =A0 =A0 =A0 Fri Nov 11 22:27:09 2011 =A0 =A0 = =A0 =A0(r227458) > +++ head/sys/net/if_tap.c =A0 =A0 =A0 Fri Nov 11 22:57:52 2011 =A0 =A0 = =A0 =A0(r227459) > @@ -218,7 +218,7 @@ tap_destroy(struct tap_softc *tp) > =A0 =A0 =A0 =A0knlist_destroy(&tp->tap_rsel.si_note); > =A0 =A0 =A0 =A0destroy_dev(tp->tap_dev); > =A0 =A0 =A0 =A0ether_ifdetach(ifp); > - =A0 =A0 =A0 if_free_type(ifp, IFT_ETHER); > + =A0 =A0 =A0 if_free(ifp); > > =A0 =A0 =A0 =A0mtx_destroy(&tp->tap_mtx); > =A0 =A0 =A0 =A0free(tp, M_TAP); > > Modified: head/sys/net/if_vlan.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_vlan.c =A0 =A0 =A0Fri Nov 11 22:27:09 2011 =A0 =A0 = =A0 =A0(r227458) > +++ head/sys/net/if_vlan.c =A0 =A0 =A0Fri Nov 11 22:57:52 2011 =A0 =A0 = =A0 =A0(r227459) > @@ -967,7 +967,7 @@ vlan_clone_create(struct if_clone *ifc, > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 */ > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ether_ifdetach(ifp); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0vlan_unconfig(ifp); > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if_free_type(ifp, IFT_ETHER= ); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 if_free(ifp); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ifc_free_unit(ifc, unit); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0free(ifv, M_VLAN); > > @@ -989,7 +989,7 @@ vlan_clone_destroy(struct if_clone *ifc, > > =A0 =A0 =A0 =A0ether_ifdetach(ifp); =A0 =A0/* first, remove it from syste= m-wide lists */ > =A0 =A0 =A0 =A0vlan_unconfig(ifp); =A0 =A0 /* now it can be unconfigured = and freed */ > - =A0 =A0 =A0 if_free_type(ifp, IFT_ETHER); > + =A0 =A0 =A0 if_free(ifp); > =A0 =A0 =A0 =A0free(ifv, M_VLAN); > =A0 =A0 =A0 =A0ifc_free_unit(ifc, unit); > > > Modified: head/sys/netgraph/ng_fec.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netgraph/ng_fec.c =A0Fri Nov 11 22:27:09 2011 =A0 =A0 =A0 = =A0(r227458) > +++ head/sys/netgraph/ng_fec.c =A0Fri Nov 11 22:57:52 2011 =A0 =A0 =A0 = =A0(r227459) > @@ -1332,7 +1332,7 @@ ng_fec_shutdown(node_p node) > =A0 =A0 =A0 =A0} > > =A0 =A0 =A0 =A0ether_ifdetach(priv->ifp); > - =A0 =A0 =A0 if_free_type(priv->ifp, IFT_ETHER); > + =A0 =A0 =A0 if_free(priv->ifp); > =A0 =A0 =A0 =A0ifmedia_removeall(&priv->ifmedia); > =A0 =A0 =A0 =A0ng_fec_free_unit(priv->unit); > =A0 =A0 =A0 =A0free(priv, M_NETGRAPH); > > Modified: head/sys/netinet/ip_carp.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_carp.c =A0Fri Nov 11 22:27:09 2011 =A0 =A0 =A0 = =A0(r227458) > +++ head/sys/netinet/ip_carp.c =A0Fri Nov 11 22:57:52 2011 =A0 =A0 =A0 = =A0(r227459) > @@ -472,7 +472,7 @@ carp_clone_destroy(struct ifnet *ifp) > =A0 =A0 =A0 =A0mtx_unlock(&carp_mtx); > =A0 =A0 =A0 =A0bpfdetach(ifp); > =A0 =A0 =A0 =A0if_detach(ifp); > - =A0 =A0 =A0 if_free_type(ifp, IFT_ETHER); > + =A0 =A0 =A0 if_free(ifp); > =A0#ifdef INET > =A0 =A0 =A0 =A0free(sc->sc_imo.imo_membership, M_CARP); > =A0#endif >