Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 12 Nov 2011 16:33:36 -0800
From:      Ben Laurie <benl@freebsd.org>
To:        Brooks Davis <brooks@freebsd.org>
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
Message-ID:  <CAG5KPzxfAoDMBC8qxBD78QuabiLQbuPtmJaUsDS-izcwte62tA@mail.gmail.com>
In-Reply-To: <201111112257.pABMvqjl012442@svn.freebsd.org>
References:  <201111112257.pABMvqjl012442@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help 
On Fri, Nov 11, 2011 at 2:57 PM, Brooks Davis <brooks@freebsd.org> 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
>

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG5KPzxfAoDMBC8qxBD78QuabiLQbuPtmJaUsDS-izcwte62tA>