From owner-svn-src-projects@FreeBSD.ORG Tue Jan 13 09:29:36 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 14D4549A; Tue, 13 Jan 2015 09:29:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0144AFAC; Tue, 13 Jan 2015 09:29:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0D9TZA0087301; Tue, 13 Jan 2015 09:29:35 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0D9TZFO087297; Tue, 13 Jan 2015 09:29:35 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201501130929.t0D9TZFO087297@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 13 Jan 2015 09:29:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277125 - projects/ifnet/sys/dev/xl X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jan 2015 09:29:36 -0000 Author: glebius Date: Tue Jan 13 09:29:34 2015 New Revision: 277125 URL: https://svnweb.freebsd.org/changeset/base/277125 Log: s/struct ifnet */if_t/ Modified: projects/ifnet/sys/dev/xl/if_xl.c projects/ifnet/sys/dev/xl/if_xlreg.h Modified: projects/ifnet/sys/dev/xl/if_xl.c ============================================================================== --- projects/ifnet/sys/dev/xl/if_xl.c Tue Jan 13 09:09:40 2015 (r277124) +++ projects/ifnet/sys/dev/xl/if_xl.c Tue Jan 13 09:29:34 2015 (r277125) @@ -1849,7 +1849,7 @@ static int xl_rxeof(struct xl_softc *sc) { struct mbuf *m; - struct ifnet *ifp = sc->xl_ifp; + if_t ifp = sc->xl_ifp; struct xl_chain_onefrag *cur_rx; int total_len; int rx_npkts = 0; @@ -2163,7 +2163,7 @@ static void xl_intr(void *arg) { struct xl_softc *sc = arg; - struct ifnet *ifp = sc->xl_ifp; + if_t ifp = sc->xl_ifp; u_int16_t status; XL_LOCK(sc); @@ -2225,7 +2225,7 @@ xl_intr(void *arg) #ifdef DEVICE_POLLING static int -xl_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +xl_poll(if_t ifp, enum poll_cmd cmd, int count) { struct xl_softc *sc = ifp->if_softc; int rx_npkts = 0; @@ -2238,7 +2238,7 @@ xl_poll(struct ifnet *ifp, enum poll_cmd } static int -xl_poll_locked(struct ifnet *ifp, enum poll_cmd cmd, int count) +xl_poll_locked(if_t ifp, enum poll_cmd cmd, int count) { struct xl_softc *sc = ifp->if_softc; int rx_npkts; @@ -2308,7 +2308,7 @@ xl_tick(void *xsc) static void xl_stats_update(struct xl_softc *sc) { - struct ifnet *ifp = sc->xl_ifp; + if_t ifp = sc->xl_ifp; struct xl_stats xl_stats; u_int8_t *p; int i; @@ -2351,7 +2351,7 @@ static int xl_encap(struct xl_softc *sc, struct xl_chain *c, struct mbuf **m_head) { struct mbuf *m_new; - struct ifnet *ifp = sc->xl_ifp; + if_t ifp = sc->xl_ifp; int error, i, nseg, total_len; u_int32_t status; @@ -2876,7 +2876,7 @@ xl_init_locked(struct xl_softc *sc) * Set media options. */ static int -xl_ifmedia_upd(struct ifnet *ifp) +xl_ifmedia_upd(if_t ifp) { struct xl_softc *sc; struct ifmedia *ifm = NULL; @@ -2920,7 +2920,7 @@ xl_ifmedia_upd(struct ifnet *ifp) * Report current media status. */ static void -xl_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr) +xl_ifmedia_sts(if_t ifp, struct ifmediareq *ifmr) { struct xl_softc *sc; u_int32_t icfg; @@ -2993,7 +2993,7 @@ xl_ifmedia_sts(struct ifnet *ifp, struct } static int -xl_ioctl(struct ifnet *ifp, u_long command, caddr_t data) +xl_ioctl(if_t ifp, u_long command, caddr_t data) { struct xl_softc *sc; struct ifreq *ifr = (struct ifreq *) data; @@ -3100,7 +3100,7 @@ xl_ioctl(struct ifnet *ifp, u_long comma static int xl_watchdog(struct xl_softc *sc) { - struct ifnet *ifp = sc->xl_ifp; + if_t ifp = sc->xl_ifp; u_int16_t status = 0; int misintr; @@ -3251,7 +3251,7 @@ static int xl_resume(device_t dev) { struct xl_softc *sc; - struct ifnet *ifp; + if_t ifp; sc = device_get_softc(dev); ifp = sc->xl_ifp; @@ -3271,7 +3271,7 @@ xl_resume(device_t dev) static void xl_setwol(struct xl_softc *sc) { - struct ifnet *ifp; + if_t ifp; u_int16_t cfg, pmstat; if ((sc->xl_flags & XL_FLAG_WOL) == 0) Modified: projects/ifnet/sys/dev/xl/if_xlreg.h ============================================================================== --- projects/ifnet/sys/dev/xl/if_xlreg.h Tue Jan 13 09:09:40 2015 (r277124) +++ projects/ifnet/sys/dev/xl/if_xlreg.h Tue Jan 13 09:29:34 2015 (r277125) @@ -587,7 +587,7 @@ struct xl_type { #define XL_NO_XCVR_PWR_MAGICBITS 0x0900 struct xl_softc { - struct ifnet *xl_ifp; /* interface info */ + if_t xl_ifp; /* interface info */ device_t xl_dev; /* device info */ struct ifmedia ifmedia; /* media info */ bus_space_handle_t xl_bhandle;