From nobody Mon Jul 4 16:40:00 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C8C7C1893F89; Mon, 4 Jul 2022 16:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LcBNw5GHhz4SFr; Mon, 4 Jul 2022 16:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656952800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aZKTUHltQa6ZoYI3tvmWDknbpD/YlDUVe2ddTvZbV3k=; b=QTAoiee8KXPgBICNba4+Z/KIy6Nwhz/dVIDn7RxqIgXmynmgAySNK/e2cLIqeOyEupjgET whiwcZ/N/2q72yQYzYZ4Av9cySWF+L9pLr3UMCytS+EH06BLIvER+eVeVoaXF+hnyBgHs6 8HQakGnvNNZzQ9VHpiXyOjX4ic7eXZjZYQ0Mb/tAqxq08omZ2reAZvJBJbOHw1skJsXwNg nDn0hjV7voS2irGHqMk2x8BuJTZk3GPcYY/dsVZZLTN6FJ4uMnHEG3XteZ2QOf90UpzQ8X x6CRY3bDbk6mi7uIDc0+GBLBjfTMp1upzWsxy23tYgqoCfLC5+FvFnhiJu7ojA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9080B14DA0; Mon, 4 Jul 2022 16:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 264Ge0OT041360; Mon, 4 Jul 2022 16:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 264Ge01J041345; Mon, 4 Jul 2022 16:40:00 GMT (envelope-from git) Date: Mon, 4 Jul 2022 16:40:00 GMT Message-Id: <202207041640.264Ge01J041345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 68d02feaefc0 - stable/13 - if_dwc: consistently use if.c helper methods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68d02feaefc0120bbe848e5375316bbc4cec7373 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656952800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aZKTUHltQa6ZoYI3tvmWDknbpD/YlDUVe2ddTvZbV3k=; b=lX+Fn8pzXyzyyQNB1+B6fb4qgbtNXwYCf/uYbS14IltE0f6bSs1tbHtSxAFTi0fzlTyLNj aukAY5GGUyIpa5pSLtmfKChTWHoXIMhqm6Iw9AHMdHIZKAJVYNf8k631NQF4+/COCrqMW/ Y7QXfCJ8jg+ymD84gqVsIZTaD+PAlFiit7j9jVVLGmNPGD5aR3nFkOzQ0SUF9bYVWEe75B 0rrf5yoffhJqMM4gjSkefd3EaRug6EPPb/iAWHKWyscP1ad8sSBoQg6pWpoM7wuzaaRVDO MDGUGCAtPsim1EbQ8AOTT2aUhbhAKin/DISsmLC6RH2bWT3nGQQBQIl8we7jnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656952800; a=rsa-sha256; cv=none; b=K+v/yZKYl4B7nZ3T47bjF63u/mBXV5x+Uu7hvFBrnCyYigtJKicGv8qOQt5Axmd+Q/LzvO npgmdg4bOEacUhYXvjQEzg3oe+3e8qhytqq54ai8qmfKJyeGFP9rADTy/8dLbjxd4WlwOl sYlauywuOGnfZjUTdmhRXd0SIFWYNqmHR1HTunEzK3JFUV4t2kL96s33XShMR8UHsGJIp9 4aaopNUAIz9ZTzOTYsD24c7CdjP+QHf14AvrLUOgTXDd6VjjjkbK01CP3Eh6v9HzFxBj7p XBk5q51STxzf8jjhOD2kGCrFKq5ybVRm3MD/zvXlEzbeKGdhgZ+3gmcNZJcwTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=68d02feaefc0120bbe848e5375316bbc4cec7373 commit 68d02feaefc0120bbe848e5375316bbc4cec7373 Author: Mitchell Horne AuthorDate: 2022-06-21 13:28:06 +0000 Commit: Mitchell Horne CommitDate: 2022-07-04 16:34:56 +0000 if_dwc: consistently use if.c helper methods And if_t rather than struct ifnet *. No functional change intended. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35497 (cherry picked from commit ca01879004d4fe49c2617f15048a52281963d0ac) --- sys/dev/dwc/if_dwc.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c index e2bdf9965f84..841026100eaf 100644 --- a/sys/dev/dwc/if_dwc.c +++ b/sys/dev/dwc/if_dwc.c @@ -354,12 +354,12 @@ dwc_miibus_statchg(device_t dev) */ static void -dwc_media_status(struct ifnet * ifp, struct ifmediareq *ifmr) +dwc_media_status(if_t ifp, struct ifmediareq *ifmr) { struct dwc_softc *sc; struct mii_data *mii; - sc = ifp->if_softc; + sc = if_getsoftc(ifp); mii = sc->mii_softc; DWC_LOCK(sc); mii_pollstat(mii); @@ -376,12 +376,12 @@ dwc_media_change_locked(struct dwc_softc *sc) } static int -dwc_media_change(struct ifnet * ifp) +dwc_media_change(if_t ifp) { struct dwc_softc *sc; int error; - sc = ifp->if_softc; + sc = if_getsoftc(ifp); DWC_LOCK(sc); error = dwc_media_change_locked(sc); @@ -441,7 +441,7 @@ static void dwc_setup_rxfilter(struct dwc_softc *sc) { struct dwc_hash_maddr_ctx ctx; - struct ifnet *ifp; + if_t ifp; uint8_t *eaddr; uint32_t ffval, hi, lo; int nhash, i; @@ -454,7 +454,7 @@ dwc_setup_rxfilter(struct dwc_softc *sc) /* * Set the multicast (group) filter hash. */ - if ((ifp->if_flags & IFF_ALLMULTI) != 0) { + if ((if_getflags(ifp) & IFF_ALLMULTI) != 0) { ffval = (FRAME_FILTER_PM); for (i = 0; i < nhash; i++) ctx.hash[i] = ~0; @@ -469,7 +469,7 @@ dwc_setup_rxfilter(struct dwc_softc *sc) /* * Set the individual address filter hash. */ - if (ifp->if_flags & IFF_PROMISC) + if ((if_getflags(ifp) & IFF_PROMISC) != 0) ffval |= (FRAME_FILTER_PR); /* @@ -802,7 +802,7 @@ static struct mbuf * dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc, struct dwc_bufmap *map) { - struct ifnet *ifp; + if_t ifp; struct mbuf *m, *m0; int len; uint32_t rdesc0; @@ -873,7 +873,7 @@ dwc_rxfinish_one(struct dwc_softc *sc, struct dwc_hwdesc *desc, m_adj(m, -ETHER_CRC_LEN); DWC_UNLOCK(sc); - (*ifp->if_input)(ifp, m); + if_input(ifp, m); DWC_LOCK(sc); return (m0); } @@ -1050,7 +1050,7 @@ out: static void dwc_txstart_locked(struct dwc_softc *sc) { - struct ifnet *ifp; + if_t ifp; struct mbuf *m; int enqueued; @@ -1099,9 +1099,9 @@ dwc_txstart_locked(struct dwc_softc *sc) } static void -dwc_txstart(struct ifnet *ifp) +dwc_txstart(if_t ifp) { - struct dwc_softc *sc = ifp->if_softc; + struct dwc_softc *sc = if_getsoftc(ifp); DWC_LOCK(sc); dwc_txstart_locked(sc); @@ -1111,7 +1111,7 @@ dwc_txstart(struct ifnet *ifp) static void dwc_init_locked(struct dwc_softc *sc) { - struct ifnet *ifp = sc->ifp; + if_t ifp = sc->ifp; DWC_ASSERT_LOCKED(sc); @@ -1146,7 +1146,7 @@ dwc_init(void *if_softc) static void dwc_stop_locked(struct dwc_softc *sc) { - struct ifnet *ifp; + if_t ifp; DWC_ASSERT_LOCKED(sc); @@ -1162,14 +1162,14 @@ dwc_stop_locked(struct dwc_softc *sc) } static int -dwc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) +dwc_ioctl(if_t ifp, u_long cmd, caddr_t data) { struct dwc_softc *sc; struct mii_data *mii; struct ifreq *ifr; int flags, mask, error; - sc = ifp->if_softc; + sc = if_getsoftc(ifp); ifr = (struct ifreq *)data; error = 0; @@ -1238,7 +1238,7 @@ dwc_txfinish_locked(struct dwc_softc *sc) { struct dwc_bufmap *bmap; struct dwc_hwdesc *desc; - struct ifnet *ifp; + if_t ifp; int idx, last_idx; bool map_finished; @@ -1369,7 +1369,7 @@ static void dwc_clear_stats(struct dwc_softc *sc) static void dwc_harvest_stats(struct dwc_softc *sc) { - struct ifnet *ifp; + if_t ifp; /* We don't need to harvest too often. */ if (++sc->stats_harvest_count < STATS_HARVEST_INTERVAL) @@ -1402,7 +1402,7 @@ static void dwc_tick(void *arg) { struct dwc_softc *sc; - struct ifnet *ifp; + if_t ifp; int link_was_up; sc = arg; @@ -1551,7 +1551,7 @@ dwc_attach(device_t dev) { uint8_t macaddr[ETHER_ADDR_LEN]; struct dwc_softc *sc; - struct ifnet *ifp; + if_t ifp; int error, i; uint32_t reg; phandle_t node; @@ -1677,7 +1677,7 @@ dwc_attach(device_t dev) /* Set up the ethernet interface. */ sc->ifp = ifp = if_alloc(IFT_ETHER); - ifp->if_softc = sc; + if_setsoftc(ifp, sc); if_initname(ifp, device_get_name(dev), device_get_unit(dev)); if_setflags(sc->ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); if_setstartfn(ifp, dwc_txstart);