From nobody Mon Feb 6 20:57:04 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 4P9dqN3Rpnz3nQNN; Mon, 6 Feb 2023 20:57:04 +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 4P9dqN2nDNz4270; Mon, 6 Feb 2023 20:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675717024; 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=cfMtgAJobWN8NKwrCUa2SGeD66aA0Z35TiVpKYpKnPg=; b=lJ3Gvvo1c63n8axYfHou9k8vrxf/M4x3Nf8ElO9CVRN+BOnTElg3odRNcw/TzmJzcC7csY 5IftmTWwWSJashIjsJQC+JcVABXdh5+/doyHBRTCrficyqfyX8ut9aGIAM5odlvCQjfocE d/N+Y9O8m4jO/Zqxqx9VGQLoqu1z4ZclUxvAdTBBKvCbjRnqt86izbDQEucvUIFNcLghng r+4oHWnC4xtmZTkTLBZtTrSV3nniJUZtYC6/tjxxKmu5o4pGHIPCewo6u3H86Gw0IoSXkf hBHOkP5/9PJ6XIhrCO1Tk74UyocNBKa05ZLp7sOHWC/cQu8OTBOakFYVa7RFCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675717024; 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=cfMtgAJobWN8NKwrCUa2SGeD66aA0Z35TiVpKYpKnPg=; b=VcdgN9NLoyKN9cEuhy/eAWv69JL4YFv5aSNP+R7qaPEAVIr48JetIYtQQ/jW0t+NOQhzgp u2Bwih+t25IvzvuMVj1sHCCSxpAY1etfFSGy/Wlv2H99R7qOeL4V3/7krbr6ENhib7kTeQ Bxcya7Q28xdg5ItQh8BlRla4j1LsMlg5/5+cgVidcghvCYA4ZXtrCpGZQBt7W5qm5a8Hnj 8p9C5Twz+Y4+/dGS7DDinInnD6Eq9ZwqSqHdUUPbinkxBWXb65k6f3XXJ3WEJzC9kAnIbc qawoQ/SumkoXGQy2L/f8KUCY6v/lJnDHgIaDPLTJtfG3qclBk13eLgJiLEY5HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675717024; a=rsa-sha256; cv=none; b=G9EvP0bjnkrGCym9X+6+pVHOH2OlbrP0NzOGDttLqzpVWbU9L/j8HLD9Nfv9IT6l2RzXY4 YNAHCo6skXiDivy6JIUF9vMxjAwsNrmDwacGfpDpzHpKlE8OoYZYF4YSLYBQ+9vQfQGFlZ 7YA2sxGVasANU0RzGXsoVWkNv2epkvUwJVIX1is4rvw5tIJ+Ugs7L5NzPjiJgcrEc9Ho+V vVBknKbI0ZlyGHzIhpHvNFESmS/ED/92822CEwlJn46dX6xjlgC15cD5dTwWdc3XG5cfUf eu5nlURGVk26GSxh68PQhiF3hP/FzZ5YxoQRUHWqxAbeuap3QiTtRG0f49jj5A== 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 4P9dqN1tLWzqNp; Mon, 6 Feb 2023 20:57:04 +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 316Kv40G034617; Mon, 6 Feb 2023 20:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316Kv4XG034616; Mon, 6 Feb 2023 20:57:04 GMT (envelope-from git) Date: Mon, 6 Feb 2023 20:57:04 GMT Message-Id: <202302062057.316Kv4XG034616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 96ab5e719955 - main - mge(4): Fix build after IfAPI conversion 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96ab5e719955066730747da3c58b77c356e84afe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=96ab5e719955066730747da3c58b77c356e84afe commit 96ab5e719955066730747da3c58b77c356e84afe Author: Justin Hibbits AuthorDate: 2023-02-06 20:45:02 +0000 Commit: Justin Hibbits CommitDate: 2023-02-06 20:56:22 +0000 mge(4): Fix build after IfAPI conversion Fixes: 98fe10c8fc08 Sponsored by: Juniper Networks, Inc. --- sys/dev/mge/if_mge.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c index af244c590769..b3664eeb66a0 100644 --- a/sys/dev/mge/if_mge.c +++ b/sys/dev/mge/if_mge.c @@ -478,7 +478,7 @@ mge_set_prom_mode(struct mge_softc *sc, uint8_t queue) uint32_t reg_val, i; /* Enable or disable promiscuous mode as needed */ - if (sc->if_getflags(ifp) & IFF_PROMISC) { + if (if_getflags(sc->ifp) & IFF_PROMISC) { port_config = MGE_READ(sc, MGE_PORT_CONFIG); port_config |= PORT_CONFIG_UPM; MGE_WRITE(sc, MGE_PORT_CONFIG, port_config); @@ -1200,15 +1200,15 @@ mge_init_locked(void *arg) * * ...only if polling is not turned on. Disable interrupts explicitly * if polling is enabled. */ - if (sc->if_getcapenable(ifp) & IFCAP_POLLING) + if (if_getcapenable(sc->ifp) & IFCAP_POLLING) mge_intrs_ctrl(sc, 0); else #endif /* DEVICE_POLLING */ mge_intrs_ctrl(sc, 1); /* Activate network interface */ - if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0); - if_setdrvflagbits(ifp, 0, IFF_DRV_OACTIVE); + if_setdrvflagbits(sc->ifp, IFF_DRV_RUNNING, 0); + if_setdrvflagbits(sc->ifp, 0, IFF_DRV_OACTIVE); sc->wd_timer = 0; /* Schedule watchdog timeout */ @@ -1226,7 +1226,7 @@ mge_intr_rxtx(void *arg) MGE_GLOBAL_LOCK(sc); #ifdef DEVICE_POLLING - if (sc->if_getcapenable(ifp) & IFCAP_POLLING) { + if (if_getcapenable(sc->ifp) & IFCAP_POLLING) { MGE_GLOBAL_UNLOCK(sc); return; } @@ -1283,7 +1283,7 @@ mge_intr_rx(void *arg) { MGE_RECEIVE_LOCK(sc); #ifdef DEVICE_POLLING - if (sc->if_getcapenable(ifp) & IFCAP_POLLING) { + if (if_getcapenable(sc->ifp) & IFCAP_POLLING) { MGE_RECEIVE_UNLOCK(sc); return; } @@ -1405,7 +1405,7 @@ mge_intr_tx(void *arg) MGE_TRANSMIT_LOCK(sc); #ifdef DEVICE_POLLING - if (sc->if_getcapenable(ifp) & IFCAP_POLLING) { + if (if_getcapenable(sc->ifp) & IFCAP_POLLING) { MGE_TRANSMIT_UNLOCK(sc); return; } @@ -1625,7 +1625,7 @@ mge_shutdown(device_t dev) MGE_GLOBAL_LOCK(sc); #ifdef DEVICE_POLLING - if (sc->if_getcapenable(ifp) & IFCAP_POLLING) + if (if_getcapenable(sc->ifp) & IFCAP_POLLING) ether_poll_deregister(sc->ifp); #endif