Date: Sat, 26 Oct 2013 19:04:44 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257188 - in projects/ifnet: contrib/libpcap sbin/mdconfig sys/contrib/altq/altq sys/dev/mii sys/dev/uart sys/dev/usb/net sys/dev/xl sys/net Message-ID: <201310261904.r9QJ4iKg093491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sat Oct 26 19:04:43 2013 New Revision: 257188 URL: http://svnweb.freebsd.org/changeset/base/257188 Log: Merge head r256150 through r257186. Added: projects/ifnet/sys/net/pf.h - copied unchanged from r257186, head/sys/net/pf.h projects/ifnet/sys/net/pf_altq.h - copied unchanged from r257186, head/sys/net/pf_altq.h Modified: projects/ifnet/contrib/libpcap/grammar.y projects/ifnet/sbin/mdconfig/mdconfig.8 projects/ifnet/sys/contrib/altq/altq/altq_cbq.c projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c projects/ifnet/sys/contrib/altq/altq/altq_priq.c projects/ifnet/sys/contrib/altq/altq/altq_red.c projects/ifnet/sys/contrib/altq/altq/altq_rio.c projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c projects/ifnet/sys/contrib/altq/altq/altq_subr.c projects/ifnet/sys/dev/mii/acphy.c projects/ifnet/sys/dev/mii/amphy.c projects/ifnet/sys/dev/mii/atphy.c projects/ifnet/sys/dev/mii/axphy.c projects/ifnet/sys/dev/mii/bmtphy.c projects/ifnet/sys/dev/mii/brgphy.c projects/ifnet/sys/dev/mii/ciphy.c projects/ifnet/sys/dev/mii/e1000phy.c projects/ifnet/sys/dev/mii/gentbi.c projects/ifnet/sys/dev/mii/icsphy.c projects/ifnet/sys/dev/mii/ip1000phy.c projects/ifnet/sys/dev/mii/jmphy.c projects/ifnet/sys/dev/mii/lxtphy.c projects/ifnet/sys/dev/mii/mii_physubr.c projects/ifnet/sys/dev/mii/mlphy.c projects/ifnet/sys/dev/mii/nsgphy.c projects/ifnet/sys/dev/mii/nsphy.c projects/ifnet/sys/dev/mii/nsphyter.c projects/ifnet/sys/dev/mii/pnaphy.c projects/ifnet/sys/dev/mii/qsphy.c projects/ifnet/sys/dev/mii/rdcphy.c projects/ifnet/sys/dev/mii/rgephy.c projects/ifnet/sys/dev/mii/rlphy.c projects/ifnet/sys/dev/mii/rlswitch.c projects/ifnet/sys/dev/mii/smcphy.c projects/ifnet/sys/dev/mii/smscphy.c projects/ifnet/sys/dev/mii/tdkphy.c projects/ifnet/sys/dev/mii/tlphy.c projects/ifnet/sys/dev/mii/truephy.c projects/ifnet/sys/dev/mii/ukphy.c projects/ifnet/sys/dev/mii/xmphy.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/usb/net/ruephy.c projects/ifnet/sys/dev/xl/xlphy.c projects/ifnet/sys/net/pfvar.h Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/libpcap/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/sys/ (props changed) Modified: projects/ifnet/contrib/libpcap/grammar.y ============================================================================== --- projects/ifnet/contrib/libpcap/grammar.y Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/contrib/libpcap/grammar.y Sat Oct 26 19:04:43 2013 (r257188) @@ -56,7 +56,7 @@ struct rtentry; #include "gencode.h" #ifdef HAVE_NET_PFVAR_H #include <net/if.h> -#include <net/pfvar.h> +#include <net/pf.h> #include <net/if_pflog.h> #endif #include "ieee80211.h" Modified: projects/ifnet/sbin/mdconfig/mdconfig.8 ============================================================================== --- projects/ifnet/sbin/mdconfig/mdconfig.8 Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sbin/mdconfig/mdconfig.8 Sat Oct 26 19:04:43 2013 (r257188) @@ -41,7 +41,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2013 +.Dd October 26, 2013 .Dt MDCONFIG 8 .Os .Sh NAME Modified: projects/ifnet/sys/contrib/altq/altq/altq_cbq.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_cbq.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_cbq.c Sat Oct 26 19:04:43 2013 (r257188) @@ -54,9 +54,12 @@ #endif #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> -#include <net/pfvar.h> +#include <net/pf.h> +#include <net/pf_altq.h> +#include <net/pf_mtag.h> #include <altq/altq.h> #include <altq/altq_cbq.h> #ifdef ALTQ3_COMPAT Modified: projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_cdnr.c Sat Oct 26 19:04:43 2013 (r257188) @@ -55,6 +55,7 @@ #include <netinet/ip6.h> #endif +#include <altq/if_altq.h> #include <altq/altq.h> #ifdef ALTQ3_COMPAT #include <altq/altq_conf.h> Modified: projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_hfsc.c Sat Oct 26 19:04:43 2013 (r257188) @@ -66,9 +66,12 @@ #endif /* ALTQ3_COMPAT */ #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> -#include <net/pfvar.h> +#include <net/pf.h> +#include <net/pf_altq.h> +#include <net/pf_mtag.h> #include <altq/altq.h> #include <altq/altq_hfsc.h> #ifdef ALTQ3_COMPAT Modified: projects/ifnet/sys/contrib/altq/altq/altq_priq.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_priq.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_priq.c Sat Oct 26 19:04:43 2013 (r257188) @@ -51,9 +51,12 @@ #include <sys/queue.h> #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> -#include <net/pfvar.h> +#include <net/pf.h> +#include <net/pf_altq.h> +#include <net/pf_mtag.h> #include <altq/altq.h> #ifdef ALTQ3_COMPAT #include <altq/altq_conf.h> Modified: projects/ifnet/sys/contrib/altq/altq/altq_red.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_red.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_red.c Sat Oct 26 19:04:43 2013 (r257188) @@ -86,6 +86,7 @@ #endif /* ALTQ3_COMPAT */ #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -94,7 +95,9 @@ #include <netinet/ip6.h> #endif -#include <net/pfvar.h> +#include <net/pf.h> +#include <net/pf_altq.h> +#include <net/pf_mtag.h> #include <altq/altq.h> #include <altq/altq_red.h> #ifdef ALTQ3_COMPAT Modified: projects/ifnet/sys/contrib/altq/altq/altq_rio.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_rio.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_rio.c Sat Oct 26 19:04:43 2013 (r257188) @@ -81,6 +81,7 @@ #endif #include <net/if.h> +#include <net/if_var.h> #include <netinet/in.h> #include <netinet/in_systm.h> @@ -89,7 +90,8 @@ #include <netinet/ip6.h> #endif -#include <net/pfvar.h> +#include <net/pf.h> +#include <net/pf_altq.h> #include <altq/altq.h> #include <altq/altq_cdnr.h> #include <altq/altq_red.h> Modified: projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_rmclass.c Sat Oct 26 19:04:43 2013 (r257188) @@ -59,12 +59,14 @@ #endif #include <net/if.h> +#include <net/if_var.h> #ifdef ALTQ3_COMPAT #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> #endif +#include <altq/if_altq.h> #include <altq/altq.h> #include <altq/altq_rmclass.h> #include <altq/altq_rmclass_debug.h> Modified: projects/ifnet/sys/contrib/altq/altq/altq_subr.c ============================================================================== --- projects/ifnet/sys/contrib/altq/altq/altq_subr.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/contrib/altq/altq/altq_subr.c Sat Oct 26 19:04:43 2013 (r257188) @@ -49,6 +49,7 @@ #include <sys/queue.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_dl.h> #include <net/if_types.h> #ifdef __FreeBSD__ @@ -64,7 +65,8 @@ #include <netinet/tcp.h> #include <netinet/udp.h> -#include <net/pfvar.h> +#include <net/pf.h> +#include <net/pf_altq.h> #include <altq/altq.h> #ifdef ALTQ3_COMPAT #include <altq/altq_conf.h> Modified: projects/ifnet/sys/dev/mii/acphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/acphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/acphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -168,12 +168,6 @@ acphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - /* Wake & deisolate up if necessary */ reg = PHY_READ(sc, MII_BMCR); if (reg & (BMCR_ISO | BMCR_PDOWN)) @@ -184,12 +178,6 @@ acphy_service(struct mii_softc *sc, stru case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * This PHY's autonegotiation doesn't need to be kicked. */ break; Modified: projects/ifnet/sys/dev/mii/amphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/amphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/amphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -119,12 +119,6 @@ amphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/atphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/atphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/atphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -116,12 +116,6 @@ atphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO || IFM_SUBTYPE(ife->ifm_media) == IFM_1000_T) { atphy_setmedia(sc, ife->ifm_media); @@ -175,12 +169,6 @@ done: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/axphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/axphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/axphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -113,12 +113,6 @@ axphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/bmtphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/bmtphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/bmtphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -159,12 +159,6 @@ bmtphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/brgphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/brgphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/brgphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <net/if.h> +#include <net/if_var.h> #include <net/ethernet.h> #include <net/if_media.h> @@ -314,10 +315,6 @@ brgphy_service(struct mii_softc *sc, str case MII_POLLSTAT: break; case MII_MEDIACHG: - /* If the interface is not up, don't do anything. */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - /* Todo: Why is this here? Is it really needed? */ PHY_RESET(sc); /* XXX hardware bug work-around */ @@ -337,11 +334,6 @@ brgphy_service(struct mii_softc *sc, str } break; case MII_TICK: - /* Bail if the interface isn't up. */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* Bail if autoneg isn't in process. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { sc->mii_ticks = 0; Modified: projects/ifnet/sys/dev/mii/ciphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/ciphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/ciphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -131,12 +131,6 @@ ciphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - ciphy_fixup(sc); /* XXX hardware bug work-around */ switch (IFM_SUBTYPE(ife->ifm_media)) { @@ -187,12 +181,6 @@ setit: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/mii/e1000phy.c ============================================================================== --- projects/ifnet/sys/dev/mii/e1000phy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/e1000phy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/bus.h> - #include <net/if.h> +#include <net/if_var.h> #include <net/if_media.h> #include <dev/mii/mii.h> @@ -311,12 +311,6 @@ e1000phy_service(struct mii_softc *sc, s break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) { e1000phy_mii_phy_auto(sc, ife->ifm_media); break; @@ -375,12 +369,6 @@ done: break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/gentbi.c ============================================================================== --- projects/ifnet/sys/dev/mii/gentbi.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/gentbi.c Sat Oct 26 19:04:43 2013 (r257188) @@ -191,12 +191,6 @@ gentbi_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/icsphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/icsphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/icsphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -145,12 +145,6 @@ icsphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/ip1000phy.c ============================================================================== --- projects/ifnet/sys/dev/mii/ip1000phy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/ip1000phy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_media.h> #include <dev/mii/mii.h> @@ -126,13 +127,6 @@ ip1000phy_service(struct mii_softc *sc, break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) { - break; - } - PHY_RESET(sc); switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: @@ -180,12 +174,6 @@ done: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/jmphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/jmphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/jmphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_media.h> #include <dev/mii/mii.h> @@ -121,24 +122,12 @@ jmphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (jmphy_setmedia(sc, ife) != EJUSTRETURN) return (EINVAL); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/lxtphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/lxtphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/lxtphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -168,12 +168,6 @@ lxtphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) == IFM_100_FX) lxtphy_set_fx(sc); else Modified: projects/ifnet/sys/dev/mii/mii_physubr.c ============================================================================== --- projects/ifnet/sys/dev/mii/mii_physubr.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/mii_physubr.c Sat Oct 26 19:04:43 2013 (r257188) @@ -209,13 +209,8 @@ int mii_phy_tick(struct mii_softc *sc) { struct ifmedia_entry *ife = sc->mii_pdata->mii_media.ifm_cur; - struct ifnet *ifp = sc->mii_pdata->mii_ifp; int reg; - /* Just bail now if the interface is down. */ - if ((ifp->if_flags & IFF_UP) == 0) - return (EJUSTRETURN); - /* * If we're not doing autonegotiation, we don't need to do * any extra work here. However, we need to check the link Modified: projects/ifnet/sys/dev/mii/mlphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/mlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/mlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -205,12 +205,6 @@ mlphy_service(xsc, mii, cmd) break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: /* @@ -266,12 +260,6 @@ mlphy_service(xsc, mii, cmd) case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/mii/nsgphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/nsgphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/nsgphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -159,12 +159,6 @@ nsgphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/nsphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/nsphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/nsphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_media.h> #include <dev/mii/mii.h> @@ -152,12 +153,6 @@ nsphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - reg = PHY_READ(sc, MII_NSPHY_PCR); /* Modified: projects/ifnet/sys/dev/mii/nsphyter.c ============================================================================== --- projects/ifnet/sys/dev/mii/nsphyter.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/nsphyter.c Sat Oct 26 19:04:43 2013 (r257188) @@ -149,12 +149,6 @@ nsphyter_service(struct mii_softc *sc, s break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/pnaphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/pnaphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/pnaphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -121,12 +121,6 @@ pnaphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_HPNA_1: mii_phy_setmedia(sc); Modified: projects/ifnet/sys/dev/mii/qsphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/qsphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/qsphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -143,23 +143,11 @@ qsphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * This PHY's autonegotiation doesn't need to be kicked. */ break; Modified: projects/ifnet/sys/dev/mii/rdcphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/rdcphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rdcphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -121,12 +121,6 @@ rdcphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_100_TX: Modified: projects/ifnet/sys/dev/mii/rgephy.c ============================================================================== --- projects/ifnet/sys/dev/mii/rgephy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rgephy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_arp.h> #include <net/if_media.h> @@ -153,12 +154,6 @@ rgephy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - PHY_RESET(sc); /* XXX hardware bug work-around */ anar = PHY_READ(sc, RGEPHY_MII_ANAR); @@ -231,12 +226,6 @@ setit: case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { Modified: projects/ifnet/sys/dev/mii/rlphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/rlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/socket.h> #include <sys/bus.h> +#include <sys/taskqueue.h> /* XXXGL: if_rlreg.h contamination */ #include <net/if.h> #include <net/if_arp.h> @@ -141,23 +142,11 @@ rlphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * The RealTek PHY's autonegotiation doesn't need to be * kicked; it continues in the background. */ Modified: projects/ifnet/sys/dev/mii/rlswitch.c ============================================================================== --- projects/ifnet/sys/dev/mii/rlswitch.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/rlswitch.c Sat Oct 26 19:04:43 2013 (r257188) @@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$"); #include <sys/module.h> #include <sys/socket.h> #include <sys/bus.h> +#include <sys/taskqueue.h> /* XXXGL: if_rlreg.h contamination */ #include <net/if.h> #include <net/if_arp.h> @@ -353,11 +354,6 @@ rlswitch_service(struct mii_softc *sc, s break; case MII_TICK: - /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); break; } Modified: projects/ifnet/sys/dev/mii/smcphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/smcphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/smcphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -134,12 +134,6 @@ smcphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: smcphy_auto(sc, ife->ifm_media); @@ -153,10 +147,6 @@ smcphy_service(struct mii_softc *sc, str break; case MII_TICK: - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) { - return (0); - } - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { break; } Modified: projects/ifnet/sys/dev/mii/smscphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/smscphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/smscphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -120,12 +120,6 @@ smscphy_service(struct mii_softc *sc, st break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: smscphy_auto(sc, ife->ifm_media); @@ -139,10 +133,6 @@ smscphy_service(struct mii_softc *sc, st break; case MII_TICK: - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) { - return (0); - } - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { break; } Modified: projects/ifnet/sys/dev/mii/tdkphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/tdkphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/tdkphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -122,12 +122,6 @@ tdkphy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/tlphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/tlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/tlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -217,12 +217,6 @@ tlphy_service(struct mii_softc *self, st break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: /* @@ -247,12 +241,6 @@ tlphy_service(struct mii_softc *self, st case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/mii/truephy.c ============================================================================== --- projects/ifnet/sys/dev/mii/truephy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/truephy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -44,6 +44,7 @@ #include <sys/bus.h> #include <net/if.h> +#include <net/if_var.h> #include <net/if_media.h> #include <net/if_arp.h> #include <net/ethernet.h> @@ -180,12 +181,6 @@ truephy_service(struct mii_softc *sc, st break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) { bmcr = PHY_READ(sc, MII_BMCR) & ~BMCR_AUTOEN; PHY_WRITE(sc, MII_BMCR, bmcr); Modified: projects/ifnet/sys/dev/mii/ukphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/ukphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/ukphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -140,12 +140,6 @@ ukphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; Modified: projects/ifnet/sys/dev/mii/xmphy.c ============================================================================== --- projects/ifnet/sys/dev/mii/xmphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/mii/xmphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -148,12 +148,6 @@ xmphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: #ifdef foo @@ -182,12 +176,6 @@ xmphy_service(struct mii_softc *sc, stru case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/uart/uart_cpu_fdt.c ============================================================================== --- projects/ifnet/sys/dev/uart/uart_cpu_fdt.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/uart/uart_cpu_fdt.c Sat Oct 26 19:04:43 2013 (r257188) @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$"); #include <sys/bus.h> #include <sys/kernel.h> #include <sys/module.h> +#include <sys/systm.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -98,10 +99,25 @@ uart_cpu_eqres(struct uart_bas *b1, stru return ((pmap_kextract(b1->bsh) == pmap_kextract(b2->bsh)) ? 1 : 0); } +static int +phandle_chosen_propdev(phandle_t chosen, const char *name, phandle_t *node) +{ + char buf[64]; + + if (OF_getprop(chosen, name, buf, sizeof(buf)) <= 0) + return (ENXIO); + if ((*node = OF_finddevice(buf)) == -1) + return (ENXIO); + + return (0); +} + int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { - char buf[64]; + const char *propnames[] = {"stdout-path", "linux,stdout-path", "stdout", + "stdin-path", "stdin", NULL}; + const char **name; struct uart_class *class; phandle_t node, chosen; pcell_t shift, br, rclk; @@ -111,7 +127,7 @@ uart_cpu_getdev(int devtype, struct uart uart_bus_space_mem = fdtbus_bs_tag; uart_bus_space_io = NULL; - /* Allow overriding the FDT uning the environment. */ + /* Allow overriding the FDT using the environment. */ class = &uart_ns8250_class; err = uart_getenv(devtype, di, class); if (!err) @@ -125,14 +141,11 @@ uart_cpu_getdev(int devtype, struct uart */ if ((chosen = OF_finddevice("/chosen")) == -1) return (ENXIO); - if (OF_getprop(chosen, "stdin", buf, sizeof(buf)) <= 0) - return (ENXIO); - if ((node = OF_finddevice(buf)) == -1) - return (ENXIO); - if (OF_getprop(chosen, "stdout", buf, sizeof(buf)) <= 0) - return (ENXIO); - if (OF_finddevice(buf) != node) - /* Only stdin == stdout is supported. */ + for (name = propnames; *name != NULL; name++) { + if (phandle_chosen_propdev(chosen, *name, &node) == 0) + break; + } + if (*name == NULL) return (ENXIO); /* * Retrieve serial attributes. Modified: projects/ifnet/sys/dev/usb/net/ruephy.c ============================================================================== --- projects/ifnet/sys/dev/usb/net/ruephy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/usb/net/ruephy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -123,23 +123,11 @@ ruephy_service(struct mii_softc *sc, str break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * Only used for autonegotiation. */ if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) Modified: projects/ifnet/sys/dev/xl/xlphy.c ============================================================================== --- projects/ifnet/sys/dev/xl/xlphy.c Sat Oct 26 19:02:39 2013 (r257187) +++ projects/ifnet/sys/dev/xl/xlphy.c Sat Oct 26 19:04:43 2013 (r257188) @@ -152,23 +152,11 @@ xlphy_service(struct mii_softc *sc, stru break; case MII_MEDIACHG: - /* - * If the interface is not up, don't do anything. - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - break; - mii_phy_setmedia(sc); break; case MII_TICK: /* - * Is the interface even up? - */ - if ((mii->mii_ifp->if_flags & IFF_UP) == 0) - return (0); - - /* * The 3Com PHY's autonegotiation doesn't need to be * kicked; it continues in the background. */ Copied: projects/ifnet/sys/net/pf.h (from r257186, head/sys/net/pf.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310261904.r9QJ4iKg093491>