From nobody Mon Feb 6 21:21:08 2023 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 4P9fM90qmxz3nRRs; Mon, 6 Feb 2023 21:21:09 +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 4P9fM85VhZz44wS; Mon, 6 Feb 2023 21:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675718468; 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=RYsqYW7feIBMoBDeZ81uYopsyagG+jo1TyNJBPkSADk=; b=Aj+dLDP9IQ5Sv8MqRb5WBEalQb479V7k1SelnQ1+GQkY8YCWwI4dk8gn7Us4KOLJyoWeHO GW0tRXV52lDN72WlRMOMTS+Pc+WMzUyMooXcbB+l+m5xzU2+OrCMiXOS6n/U2LySR4CpBG /vluwnJFZEz+DR5IjnQrYEEHUYwBi4xaR2muKw2jVBugfEJMNxKlg4yDwS4KqP1ykj7v0M dzGmqG2lZTquxSYf3QZ6Z+iynw9EJSWFF4nRQVpi0H2OWFByYqkVPnZB81UrbP3rsXiCMh ThvnJJZi7P0DJKUERO7zVIYp4c1h+FPtUBXi2SmXd/H3DYqimo1tlHXoL9iVDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675718468; 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=RYsqYW7feIBMoBDeZ81uYopsyagG+jo1TyNJBPkSADk=; b=q6ZKuDxEGwPaA193ns6QSCq/5hyqBmTygfS8e03vktijLmDijWyqf/IoxdUakwHM79YPVS xrTARveTOyJdnbQ+2WZn+7sYGb5cJdhOboGZb3vo9M0v4WaLirILVjSUg7H0BptsMZtOSj sRjdHlZtCw0shxV+g+6UfyuR5TIbW//THnEPZrU2fg9QrZQndwKjjnZFvm4e4bsfbXIxif +JFTrgvUXGvntADrWuJXgS3IhJ4amKAB7EL2EIrHPJLXp4WcC3udZz+QaAKzUd+v9MzpeL tzUxlkHluW/RJSeVYnNvWVNTtFniLvGolqnMM5whvIAXCn/y0mXHidqnw0e31Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675718468; a=rsa-sha256; cv=none; b=VJVCP9eY6k0il2mq9SyPb8e5LQd+wRjF3BE3VJEJMihv4wRv/ufltDSZDwwa2BEK45OW7T p7/JRhCJMprhG2z1mKxeD9hy0DdVwMcBqi0MivR+rD7iAEjw8HxvL/Yhpev+8fn/PdsMhE LxqlvxKWarKVM37Gym7BND/uicb9T2DbcSmKodC3ofW6NMiN1YUUrYlv0jbsaHw4hdBZYZ NAOfJdPXFF0hin7hQ/AdCLU0xeZ5A3+paSfOT9mnTIVRo62SWR8PT/o36lObXNw0q/EC83 aSOVQLx39opxG1j5q6T7CpgbqpoAnoI9ZQgcMViAy45+AN5qRJZu9cWvW6Kgqw== 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 4P9fM84bS8zqNX; Mon, 6 Feb 2023 21:21:08 +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 316LL8eL074335; Mon, 6 Feb 2023 21:21:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316LL8vS074334; Mon, 6 Feb 2023 21:21:08 GMT (envelope-from git) Date: Mon, 6 Feb 2023 21:21:08 GMT Message-Id: <202302062121.316LL8vS074334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Ambrisko Subject: git: bbd354cb2382 - main - enic: convert to IfAPI 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: ambrisko X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbd354cb2382917a2cfbbc3e918ccfe342b645b4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ambrisko: URL: https://cgit.FreeBSD.org/src/commit/?id=bbd354cb2382917a2cfbbc3e918ccfe342b645b4 commit bbd354cb2382917a2cfbbc3e918ccfe342b645b4 Author: Doug Ambrisko AuthorDate: 2023-02-06 21:17:15 +0000 Commit: Doug Ambrisko CommitDate: 2023-02-06 21:19:48 +0000 enic: convert to IfAPI Prompted by: jhibbits --- sys/dev/enic/enic.h | 2 +- sys/dev/enic/if_enic.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/dev/enic/enic.h b/sys/dev/enic/enic.h index 9d84ca6ecaf6..a2a40334986f 100644 --- a/sys/dev/enic/enic.h +++ b/sys/dev/enic/enic.h @@ -278,7 +278,7 @@ struct enic_softc { if_softc_ctx_t scctx; if_shared_ctx_t sctx; struct ifmedia *media; - struct ifnet *ifp; + if_t ifp; struct mtx enic_lock; diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index d3ac5bb902c6..537e613efa2d 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -754,12 +754,12 @@ static int enic_rxq_intr(void *rxq) { struct vnic_rq *rq; - struct ifnet *ifp; + if_t ifp; rq = (struct vnic_rq *)rxq; ifp = iflib_get_ifp(rq->vdev->softc->ctx); - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) - return (FILTER_HANDLED); + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) + return (FILTER_HANDLED); return (FILTER_SCHEDULE_THREAD); } @@ -852,7 +852,7 @@ enic_init(if_ctx_t ctx) enic_start_rq(enic, index); /* Use the current MAC address. */ - bcopy(IF_LLADDR(softc->ifp), softc->lladdr, ETHER_ADDR_LEN); + bcopy(if_getlladdr(softc->ifp), softc->lladdr, ETHER_ADDR_LEN); enic_set_lladdr(softc); ENIC_LOCK(softc); @@ -902,7 +902,7 @@ enic_copy_maddr(void *arg, struct sockaddr_dl *sdl, u_int idx) static void enic_multi_set(if_ctx_t ctx) { - struct ifnet *ifp; + if_t ifp; struct enic_softc *softc; u_int count; @@ -916,12 +916,12 @@ enic_multi_set(if_ctx_t ctx) enic_add_mcast(softc); ENIC_UNLOCK(softc); - if (ifp->if_flags & IFF_PROMISC) { + if (if_getflags(ifp) & IFF_PROMISC) { softc->promisc = 1; } else { softc->promisc = 0; } - if (ifp->if_flags & IFF_ALLMULTI) { + if (if_getflags(ifp) & IFF_ALLMULTI) { softc->allmulti = 1; } else { softc->allmulti = 0; @@ -988,18 +988,18 @@ enic_media_change(if_ctx_t ctx) static int enic_promisc_set(if_ctx_t ctx, int flags) { - struct ifnet *ifp; + if_t ifp; struct enic_softc *softc; softc = iflib_get_softc(ctx); ifp = iflib_get_ifp(ctx); - if (ifp->if_flags & IFF_PROMISC) { + if (if_getflags(ifp) & IFF_PROMISC) { softc->promisc = 1; } else { softc->promisc = 0; } - if (ifp->if_flags & IFF_ALLMULTI) { + if (if_getflags(ifp) & IFF_ALLMULTI) { softc->allmulti = 1; } else { softc->allmulti = 0;