From nobody Thu Aug 11 14:53:17 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 4M3VDG1RCfz4Y7mr;
Thu, 11 Aug 2022 14:53:18 +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 4M3VDG0w4cz3TMN;
Thu, 11 Aug 2022 14:53:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1660229598;
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=yx/16xWT0SvGOWya4a37vCAt+IGmFCUMzQOllloHK0g=;
b=QkDqvU9g1zgf/LlJHHQyOQz+/L8pUD9XGpnyiDLHTfEQ9OTTI4zAvjwqpC0cLAad8Pjaqm
AMcpnpIq8KRLkQveQAdwY3ycfXVAacGJngeXr/pWZJbG2Ho1HN03jzL2Jy5weBbGKMAC3I
HnQkmtXFuWnPgJLOnDK1kixKXiIFgroF1sASgQMAqUnwC2xOtoF32mF3bU17X79nmAb+Sf
U9i3acnUJZTbyr1v5izPX+OlYEo+Wb30udTBpYTOOOa7ZiSsG+3yC12xUgxT+fR/I5ZeNd
Ag3h79R3KtyWUVTjLB8oe4BMSOsVRpYAIdBdlkBwEl69AlwtylHjbdA+ucw2Bg==
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 4M3VDG00r2zvwx;
Thu, 11 Aug 2022 14:53:18 +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 27BErHmV032504;
Thu, 11 Aug 2022 14:53:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27BErHXW032503;
Thu, 11 Aug 2022 14:53:17 GMT
(envelope-from git)
Date: Thu, 11 Aug 2022 14:53:17 GMT
Message-Id: <202208111453.27BErHXW032503@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mitchell Horne <mhorne@FreeBSD.org>
Subject: git: 248c1390cccc - stable/12 - if_dwc: Use if_ function where appropriate
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
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/12
X-Git-Reftype: branch
X-Git-Commit: 248c1390cccc91cbfc6cfc5f91ae257e368dae8e
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1660229598;
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=yx/16xWT0SvGOWya4a37vCAt+IGmFCUMzQOllloHK0g=;
b=EHTh8ikLx1mr5pEN9D3d6BD5sR3rVMFGhwR13ee2rCnO8L1aMpiLLUhIQw1eptWbQRrtCZ
s+9FbdKssu1mc9zPadI9SLUADv4AiCsOXJFi7dSHKk6jQlIqk8IxC26Ap7b2M2ENvPk+V7
2RoLgjPAtHIi6BZyDFERGpRegxFwYM8hZosw3q5ItIwCA61/Zt1dtqCAcHniWBM/iho4s5
UErM6Pya1KzAIBzbwKjtTTDiByNqVWghO1KwpB8e3ksO1BtO/LrILUzo7TBFtvQ7BVf38E
WJcZiluiB+TKCXE+3N/nO99PQI19hqpzoHbG/7U7wydbutppENjNGBti4uaU8A==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660229598; a=rsa-sha256; cv=none;
b=c/A7fUwQwhil7SHHjLtXnwg3itFTrX0lQN21ofOFrkg+mNi8xIAondewKU3Tr+hcQXR9TZ
vPFaMwhHDouq5s7Lyv4Fv5KLD9pstp2jFzsTeWcc8owp/xjmf54p18KAzBWZhAWwUnpGuw
cvQLHzmx6o1eKTyOWHInYQweYzgdK42U0V5m+B2q4hmOwy1RigtDLYtGhZS6QoKsthNA5N
pul6i1jciakSKwUbo1KZQEeABHVBcpS1lYB46hBDAG01v+EzZoyCLCv2UrU3UYl+BSq6hf
h8FLUgD5TYTlOL0NX1ngn42ID6zhU2NbODdxBevotLuq8IDljRCv7Wfp33sJag==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/12 has been updated by mhorne:
URL: https://cgit.FreeBSD.org/src/commit/?id=248c1390cccc91cbfc6cfc5f91ae257e368dae8e
commit 248c1390cccc91cbfc6cfc5f91ae257e368dae8e
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2020-11-20 11:30:23 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2022-08-11 14:52:02 +0000
if_dwc: Use if_ function where appropriate
No functional changes intended
(cherry picked from commit 3bbd11ee511a5256fe3bb525980207b75e41bab9)
---
sys/dev/dwc/if_dwc.c | 56 ++++++++++++++++++++++++++--------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/sys/dev/dwc/if_dwc.c b/sys/dev/dwc/if_dwc.c
index 355c3489c85f..919f8fee1527 100644
--- a/sys/dev/dwc/if_dwc.c
+++ b/sys/dev/dwc/if_dwc.c
@@ -983,25 +983,26 @@ dwc_txstart_locked(struct dwc_softc *sc)
ifp = sc->ifp;
- if (ifp->if_drv_flags & IFF_DRV_OACTIVE)
+ if ((if_getdrvflags(ifp) & (IFF_DRV_RUNNING|IFF_DRV_OACTIVE)) !=
+ IFF_DRV_RUNNING)
return;
enqueued = 0;
for (;;) {
if (sc->txcount == (TX_DESC_COUNT - 1)) {
- ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+ if_setdrvflagbits(ifp, IFF_DRV_OACTIVE, 0);
break;
}
- IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
+ m = if_dequeue(ifp);
if (m == NULL)
break;
if (dwc_setup_txbuf(sc, sc->tx_idx_head, &m) != 0) {
- IFQ_DRV_PREPEND(&ifp->if_snd, m);
+ if_sendq_prepend(ifp, m);
break;
}
- BPF_MTAP(ifp, m);
+ if_bpfmtap(ifp, m);
sc->tx_idx_head = next_txidx(sc, sc->tx_idx_head);
++enqueued;
}
@@ -1029,7 +1030,7 @@ dwc_init_locked(struct dwc_softc *sc)
DWC_ASSERT_LOCKED(sc);
- if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+ if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
return;
dwc_setup_rxfilter(sc);
@@ -1065,7 +1066,7 @@ dwc_stop_locked(struct dwc_softc *sc)
DWC_ASSERT_LOCKED(sc);
ifp = sc->ifp;
- ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+ if_setdrvflagbits(ifp, 0, IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
sc->tx_watchdog_count = 0;
sc->stats_harvest_count = 0;
@@ -1081,7 +1082,7 @@ dwc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
struct dwc_softc *sc;
struct mii_data *mii;
struct ifreq *ifr;
- int mask, error;
+ int flags, mask, error;
sc = ifp->if_softc;
ifr = (struct ifreq *)data;
@@ -1090,25 +1091,25 @@ dwc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
switch (cmd) {
case SIOCSIFFLAGS:
DWC_LOCK(sc);
- if (ifp->if_flags & IFF_UP) {
- if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
- if ((ifp->if_flags ^ sc->if_flags) &
- (IFF_PROMISC | IFF_ALLMULTI))
+ if (if_getflags(ifp) & IFF_UP) {
+ if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
+ flags = if_getflags(ifp) ^ sc->if_flags;
+ if ((flags & (IFF_PROMISC|IFF_ALLMULTI)) != 0)
dwc_setup_rxfilter(sc);
} else {
if (!sc->is_detaching)
dwc_init_locked(sc);
}
} else {
- if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+ if (if_getdrvflags(ifp) & IFF_DRV_RUNNING)
dwc_stop_locked(sc);
}
- sc->if_flags = ifp->if_flags;
+ sc->if_flags = if_getflags(ifp);
DWC_UNLOCK(sc);
break;
case SIOCADDMULTI:
case SIOCDELMULTI:
- if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+ if (if_getdrvflags(ifp) & IFF_DRV_RUNNING) {
DWC_LOCK(sc);
dwc_setup_rxfilter(sc);
DWC_UNLOCK(sc);
@@ -1120,10 +1121,10 @@ dwc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, cmd);
break;
case SIOCSIFCAP:
- mask = ifp->if_capenable ^ ifr->ifr_reqcap;
+ mask = ifr->ifr_reqcap ^ if_getcapenable(ifp);
if (mask & IFCAP_VLAN_MTU) {
/* No work to do except acknowledge the change took */
- ifp->if_capenable ^= IFCAP_VLAN_MTU;
+ if_togglecapenable(ifp, IFCAP_VLAN_MTU);
}
break;
@@ -1161,7 +1162,7 @@ dwc_txfinish_locked(struct dwc_softc *sc)
bmap->mbuf = NULL;
dwc_setup_txdesc(sc, sc->tx_idx_tail, 0, 0);
sc->tx_idx_tail = next_txidx(sc, sc->tx_idx_tail);
- ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+ if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE);
if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1);
}
@@ -1300,7 +1301,7 @@ dwc_tick(void *arg)
ifp = sc->ifp;
- if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
+ if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
return;
/*
@@ -1541,15 +1542,14 @@ dwc_attach(device_t dev)
ifp->if_softc = sc;
if_initname(ifp, device_get_name(dev), device_get_unit(dev));
- ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
- ifp->if_capabilities = IFCAP_VLAN_MTU;
- ifp->if_capenable = ifp->if_capabilities;
- ifp->if_start = dwc_txstart;
- ifp->if_ioctl = dwc_ioctl;
- ifp->if_init = dwc_init;
- IFQ_SET_MAXLEN(&ifp->if_snd, TX_DESC_COUNT - 1);
- ifp->if_snd.ifq_drv_maxlen = TX_DESC_COUNT - 1;
- IFQ_SET_READY(&ifp->if_snd);
+ if_setflags(sc->ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);
+ if_setstartfn(ifp, dwc_txstart);
+ if_setioctlfn(ifp, dwc_ioctl);
+ if_setinitfn(ifp, dwc_init);
+ if_setsendqlen(ifp, TX_DESC_COUNT - 1);
+ if_setsendqready(sc->ifp);
+ if_setcapabilities(sc->ifp, IFCAP_VLAN_MTU);
+ if_setcapenable(sc->ifp, if_getcapabilities(sc->ifp));
/* Attach the mii driver. */
error = mii_attach(dev, &sc->miibus, ifp, dwc_media_change,